Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
am: ebef186155
am: 5763102add
Change-Id: I3b236ef65dd5291c1ca562fb73c073fa08ab9ea4
This commit is contained in: