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

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

Change-Id: I0bd6574e80ad3eb2c7538fcda7cc296340afde28