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

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

Change-Id: If96621b20c0847afd6f52f10c80f1592012b2e73