Merge changes I89779ab3,I63ec0e57 am: 6c8e3812b9 am: f39786af24

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

Change-Id: Ia53c6167a3f04f1b6057a6e913585cfa93eee5d0