Merge changes from topic "reverts-for-b212364925" am: f82a5a9203

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

Change-Id: I453380faa8d3a08e63038b40c97d75fbdd72a7ea