Merge changes from topic "lmkd_ams" am: 360eb85898 am: d156fe95a2

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

Change-Id: Id59cd0b04f118ee7064107487753e7a0c21dd436