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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b9cdfdadb398afd1b3e0010daeab30faa011664