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

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

Change-Id: I944d419554ff8a8cb8b16b934e1a9ab71255330a