Merge "Change bypassRoleQualification persistence logic" into tm-dev am: 747806dd am: e6474ba2 am: b158f735 am: 87f173ba

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



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