Merge "Merge "Remove role checker for non-selfManaged association" into tm-dev...

Merge "Merge "Remove role checker for non-selfManaged association" into tm-dev am: 5f7154db am: 6c9bb47b" into tm-d1-dev-plus-aosp am: c2b3a0ec

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



Change-Id: I21090eee7d14a04826bbd1dc58516a6403f404a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>