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

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



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