Merge changes Ifc1da577,Ide630e36,Ia215f1a0 am: c3229abcc7 am: 23ff5e4cf7 am: 5e81851253 am: b45e770984 am: a022f46e0a am: 3f6399ea5e

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

Change-Id: I6e8dfc7e4a72b709bc8dafa1480ff24adcd4f816