Merge changes from topic "revert-1935201-OUHHJQVSHH" am: 416cda9bc7 am: aeb2b5871e

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

Change-Id: Ia5b11e3db9f481ca825f437d78b579063d600c11