[automerger skipped] Merge "Add change id for opting in to R selinux changes" am: b489d368a5 am: 6327b51461 -s ours am: 7162055371 -s ours
am skip reason: Merged-In I4b6a1b447917ede00e40dc4162bc01cf4b7f45f2 with SHA-1 91c374dca4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729795
Change-Id: Iafb9287496218ac78456cc3964dc296f1ee2a670
This commit is contained in: