Merge changes I809345c5,Ic6c6bec4 am: 5bff742810 am: bce82c3fea am: 3e94dc96d3 am: 9173fc1af3

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

Change-Id: If0e82f3bf3509ba5bc5fd3eaf37209c3550c6b81