Merge changes Ifc1da577,Ide630e36,Ia215f1a0 am: c3229abcc7 am: 23ff5e4cf7 am: 5e81851253

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

Change-Id: I1e0e3dc2147d713c4a82230cc10390513610f967