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

Merge changes from topic "am-d284a07f92fe4513862e928425f90707" into tm-d1-dev-plus-aosp am: 2bfc2224 am: c9fc18fe

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



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