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

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

Change-Id: Ied2a18cef9c4a614dd91aef5ad3061d327bd5e8b