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

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

Change-Id: I808b51d23f0a0e5516c572e6f9b34901c84a3fa7