Merge changes Iebdb112c,I8203868b,Icedec8cc am: 9a8bd42d58

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53201583201a5d1b3d412c89ef9e090ab8cb6ca6