Merge changes I4e5db32c,I2a448282 am: 5b4e68d756 am: 021cae6f1a am: c63f6b0555

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

Change-Id: Ib2840e65f8065a5638d9df73345e5b893a49731f