Merge changes I914fa057,I89ad4e2e am: b84297d910 am: 5de637151d am: 6004b4172d

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

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