Merge "Merge "Change bypassRoleQualification persistence logic" into tm-dev...

Merge "Merge "Change bypassRoleQualification persistence logic" into tm-dev am: 747806dd am: e6474ba2" into tm-d1-dev-plus-aosp am: dc73f197 am: 66132b49

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



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