[automerger skipped] Merge changes from topic "lmkd_ams" am: 360eb85898 am: d156fe95a2 am: 088d5b61d7 -s ours

am skip reason: Merged-In I9b65d82618654d59236c79be8cd8da66bc90c91c with SHA-1 42cda4953c is already in history

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

Change-Id: I02298cc2b0adaf733b72f9472a318572c017b8af