Merge changes I0d6020ef,I2923b255 am: 491e8451 am: fb5ccc48 am: f8f1f49e...

Merge changes I0d6020ef,I2923b255 am: 491e8451 am: fb5ccc48 am: f8f1f49e am: adfa1309 am: 7ceab4c6

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



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