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

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

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