Merge changes Ic134f27e,I654620df,I0be8837f am: 84d5709e54 am: d7a78950d6 am: ac4b8433b3

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

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