[automerger skipped] Merge "Add change id for opting in to R selinux changes" am: b489d368 am: 6327b514 -s ours am: 71620553 -s ours am: faf3b7e4 -s ours

am skip reason: Merged-In I4b6a1b447917ede00e40dc4162bc01cf4b7f45f2 with SHA-1 91c374dc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729795

Change-Id: I37be70b0a988d95baf1fe2c437c6ad66c1d4143e