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

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

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