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

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



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