Merge changes I30c813d3,Ie3eb90ad am: 9c6cc87579 am: 775fe1222d am: c323ac13e9

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

Change-Id: I56d44c52936c029a43b8d5a6363d6af234117960