Merge changes Ie9fa8c9c,I9773a4cf am: ece70230 am: ce20f7fa am: 5c143aa5...

Merge changes Ie9fa8c9c,I9773a4cf am: ece70230 am: ce20f7fa am: 5c143aa5 am: b1914fdf am: e1dbfb4e

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



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