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

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

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