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

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

Change-Id: I6cc04610f0f161c55397903f898d9b7a11507d54