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

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

Change-Id: I035bc53a7a5d298c0072448d5ad2aed723d9d5e5