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

Merge changes Ifb8d7581,I73ba8278,I6d7e3804 into tm-dev am: e7f8167e am: 3849f672 am: d4d06eb1

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



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