Merge changes Ibb8af342,I085b6aeb am: 347e9d52af am: 52ca468870 am: 085f6755d7

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

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