Merge changes Ifaea4598,I78b4d2b1,I6c1f0f88,I6b4d0ebc,I5c17f464 am: a3612f324c am: 1e8a77e679 am: 11125b582f

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

Change-Id: I74ae792bf2fecb9056f526f35922f1541c9e3eec