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

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

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