Merge changes I809345c5,Ic6c6bec4 am: 5bff742810

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

Change-Id: I171873d90f788a582442f61b14d11bf80d3aef47