commit ca0699c77695a9995f1fc25abddefa445cde958c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 09 16:25:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 09 16:25:40 2021 +0000
tree cf1b04cf9cc40cbede4eecb1e8a1016654ac5cfa
parent a9f52f80206063f2eadf5151bb73bf40bf1671ff
parent fe0e3e345451fc5775df118a23d142b0dc761b1d

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 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: I178ea5c97242d42366444f4721fbedbe5f5e3590