Merge changes I7d5ab9fb,Ib34d291f am: 6091a2d602 am: c547fe5466 am: 684895e9a1

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

Change-Id: I5796614eea0c24f962d920e8baecb3eeca3c0081