Merge changes I8c2bb308,I384f309e am: 66aaab4778

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

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