Merge changes Ibb8af342,I085b6aeb am: 347e9d52 am: 52ca4688 am: 085f6755...

Merge changes Ibb8af342,I085b6aeb am: 347e9d52 am: 52ca4688 am: 085f6755 am: 9d10e54b am: ba1fbf09

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



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