Merge changes Iad6dba81,Ic15a8a50,I7d605ac8 am: 44fc01a1f7 am: db02163fa6 am: b2258657ef

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

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