Merge changes Ic134f27e,I654620df,I0be8837f am: 84d5709e am: d7a78950 am:...

Merge changes Ic134f27e,I654620df,I0be8837f am: 84d5709e am: d7a78950 am: ac4b8433 am: 3ccbef02 am: f3592f5b

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



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