Merge changes If163fe2a,Ib736cc16 am: 9e35022143 am: a1618f31c8 am: acb9c3da99

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

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