Merge changes I2703fb81,Ie95a70c2 am: d4aa87c5c2 am: 1b6ccc6303 am: 6afdd4428e am: beb1eead8d

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

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