Merge changes I89779ab3,I63ec0e57 am: 6c8e3812b9

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

Change-Id: I3bb1e6d00d68928e627e9fb909b083babf56ec1f