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

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

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



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