Merge changes from topic "revert-1928164-reverts-for-b212364925-WFBPJHBDYR" am: 43e695221f am: 805e3fea32 am: 621b3cc652

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

Change-Id: Iae8216b59e9ab56d827bbf269276fd2d4105bf1b