Merge changes Ia2f891c2,Ibbe111b0 am: 53f9288870 am: fcad4767db

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

Change-Id: I2f8a67c5e47b9bd6c2ed374413d6c0e9cf78c83c