Merge changes from topic "reverts-for-b212364925" am: f82a5a9203 am: 8ebf9fce41 am: 5c9f79dcc1 am: 1e4e641556

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

Change-Id: Iae3c53c4fee99083f4427697e48b6958049a1ab0