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

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

Change-Id: Ie1934a4c2c467d9daa94279631eb3ac276178485