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

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

Change-Id: Iefab3593ba5f4b4b4e7b3ba8de3490af7f369acf