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

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

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