Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a

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

Change-Id: Icc73bfcb93772b2cdb3c247ff02987f123f99aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>