Merge changes I8c2bb308,I384f309e am: 66aaab4778 am: 9ad1c029cc am: 403b67742e

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

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