[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set...

[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev am: b4a530d8 -s ours am: 500b32ea -s ours am: 1dbeaebf -s ours am: efe21c91 -s ours am: e1c036a4 -s ours

am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 4670d1d8 is already in history

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

Change-Id: I120eba5ea2c3cf264b7c88bee769f76fdda83bbe