Merge changes I17399680,I4952b3ab,I743b6227 am: f110de51 am: 2b3a674a am:...

Merge changes I17399680,I4952b3ab,I743b6227 am: f110de51 am: 2b3a674a am: 0ee17e4f am: c4a6a510 am: a8ccee84 am: 5292f6fb

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



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