Merge changes I89779ab3,I63ec0e57 am: 6c8e3812b9 am: f39786af24 am: 6140d46d41 am: 4c2eeff7b3

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

Change-Id: Ibe0f03475ee9692b7a51d92f0eca1ae65af3d5d1