Merge changes I809345c5,Ic6c6bec4 am: 5bff742810 am: bce82c3fea

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

Change-Id: Iff9fa6aa6c293d60fa1669817ac5d6e342ae470b