Merge changes from topic "am-c7806d5e030b4442bbb1bcc61a98bff0" into...

Merge changes from topic "am-c7806d5e030b4442bbb1bcc61a98bff0" into tm-d1-dev-plus-aosp am: b144c81b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622



Change-Id: Ieedef41dcb62848c84f5fc8d608b60bf7d25be06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>