Merge changes Ifb8d7581,I73ba8278,I6d7e3804 into tm-dev am: e7f8167e am:...

Merge changes Ifb8d7581,I73ba8278,I6d7e3804 into tm-dev am: e7f8167e am: 7b382d31 am: da78858d am: 7fdfdbba

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



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