Merge changes I7ea231db,I2e8e89f8 am: b02d5009c1 am: 16ed7bcf9f

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

Change-Id: If5c9c1e1490d3f455e4261bef5a01ab1bd8c7fb7