Merge changes from topic "lmkd_ams" am: 360eb85898

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702074

Change-Id: I83c23ee6717baf465048891f086cfc9f5c516634