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

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

Change-Id: I3d63bf0d41f83b40a0b4baf5dce3f4592d9bd4b5