Merge changes I562f7fd1,I0ab1ed86 am: a9a7a83809 am: dccdd773bd am: 921f6e8470

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia99db5ced93053f195aa1a8eee2f72ef6ee1a9ce