Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1 am: 12d71bb8 -s ours" into sc-dev