Merge changes I4f475748,I633b634f am: f24415a9aa am: 53e7c220ee am: cb7bee4824 am: fd56d6a6ad am: 7114806686

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

Change-Id: I207b7d1d90896fd8f75e212f296ad45244f63963