Merge changes I89e4de2e,I673d7a4c,Icfb454c2,I5924a82c am: a54c861843

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

Change-Id: Ibf6c5ced4bc9d9822308c4ab4e370e7290753c39