[automerger skipped] Merge "Policy transparency dialog should be shown when...
[automerger skipped] Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev am: 4c89530f
am: 5221bbab -s ours
Change-Id: I198fb14f3d66fa1a36bf90857ae6e0183ba2c163