Merge changes I3a4f683f,I15de71ee,I93a27842,I4ad4d980 am: 99148c3722 am: ccbc7c5827

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

Change-Id: I1be8c0b2252c65ca8d19a389cf9e104ef7abc6f7