Merge changes I881f63b8,I4c5edd2d,I8ff0d29c,I6578c3a4,Iea286ab0, ... am: 2ce034f75b

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

Change-Id: I29254913a0b0ac090b42839d007ad6142077eb9f