Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours am: fe0e3e3454 -s ours am: 471ebc97c4 -s ours am: 06fe3f2674 -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: Ib1cd9be90741d9aa9a333eb3ec60ccb0c0f9c95d
This commit is contained in: