Merge changes from topic "am-1bc6dfdb03ce46beaef9bbdf6650a1d2" into...

Merge changes from topic "am-1bc6dfdb03ce46beaef9bbdf6650a1d2" into tm-d1-dev-plus-aosp am: a0453d4f am: cfcb8b7a

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



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