[automerger skipped] Merge changes from topic "lmkd_ams" am: 360eb858 am:...

[automerger skipped] Merge changes from topic "lmkd_ams" am: 360eb858 am: d156fe95 am: 088d5b61 -s ours am: 3a8ea872 -s ours

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

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

Change-Id: I967ae7e0d4f8a514d80b6b2ac8f599687854b644