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

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

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