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

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



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