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

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



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