Merge changes Iebdb112c,I8203868b,Icedec8cc am: 9a8bd42d58 am: b870254c13 am: 63697a96a9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I332557ecbb0aa09aae3279f5b9fdf420122f0aeb