Merge changes Ia14551e0,Idd32600c,I694e2aa5 am: 69ff677626 am: e9b1e96808

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

Change-Id: I8b43f96d6ac6d08320bcd0d5a11c2528cdea21d4