Merge changes I562f7fd1,I0ab1ed86 am: a9a7a83809 am: dccdd773bd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37cb795c7fa5b7f16b6066f40ffe36e113f09068