Merge changes I7d5ab9fb,Ib34d291f am: 6091a2d602 am: c547fe5466 am: 684895e9a1 am: 8f4ca3f2e1 am: 0ea0dbe9e3

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

Change-Id: Ie2c6b3c147eee88062f0e040e3b4dbcd966b9aed