Merge changes Id6f98191,Id9430ca8,Idde11124 am: 8b1701f4 am: 42594d12 am:...

Merge changes Id6f98191,Id9430ca8,Idde11124 am: 8b1701f4 am: 42594d12 am: fd845bf0 am: caa918f4 am: 1dd752d9

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



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