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 am: 5c30491a am: 73f83e22

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



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