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

Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b am: c3bbf823 am: 7a1d3efb

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



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