Merge changes Ia3eae81c,Iff44fb23 am: 372c4810c7 am: a7459772bb

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

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