Merge changes Ie98c9fec,I2de6bc77 am: 3f242853 am: 00d9ad44 am: cb861cc1...

Merge changes Ie98c9fec,I2de6bc77 am: 3f242853 am: 00d9ad44 am: cb861cc1 am: d6d02189 am: d8572a7e

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



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