Merge changes I10c3bf8a,Ifaafdbfb,I9f570567 am: aaf1ba472a am: aaa954a6ae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11b91da3dd77269e00e37ef340a4c50adcb9c3cd