Merge changes I53da0d94,I0fe853df,I69ef50cc am: 08ade0ad0e

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

Change-Id: Iadcdac95a563867fc809017b6af5ff2c91f749a0