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

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

Change-Id: I8a0812d1451b9c02f852a1920c25e8669ab733eb