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

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

Change-Id: I17565ff4566baca443a9fbb9b1877881a86b9996