Merge changes from topic "am-3cd719d3702d43039edfadbfadeb3a56" into...

Merge changes from topic "am-3cd719d3702d43039edfadbfadeb3a56" into tm-d1-dev-plus-aosp am: d2212ddc am: 123cf227

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



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