Merge changes from topic "revert-1926977-NUIGVFOGKB" am: 8aa3bf90c9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927603

Change-Id: I3e85819bfe320ed7dbfaa8c9c1ff732e260451c5