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

Merge "Remove role checker for non-selfManaged association" into tm-dev am: 5f7154db am: 15f629e4

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



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