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

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

Change-Id: I5d426668db020936f83c3d4b12fe3d70627d306e