Merge changes I51a58e57,Ibdf8c2c5,I0b1e9221,Ie2a62c5a,Ic7fab603, ... am: 1d66f1aabb

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

Change-Id: I92d7531c95890d94e1bc8d8a57b89136f6ad39ab