Merge changes I292b8e32,I689d0838 am: 1488a15856 am: cab292d695 am: 33e1705271

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

Change-Id: Ie726bb550f5b960145e7b5a70e2ea7eb0bf54625