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

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

Change-Id: If65cffba935468a96dab8d16a15bc233b478c913