Increased the number of adding a role holder retries to 12.

This CL also contains an extra check on whether the role has been assigned or not.

Bug: 383915983
Bug: 383126661
Test: atest DeviceLockUnitTests
Flag: EXEMPT bugfix

Change-Id: Ib28973ca8141480a13028b41084af3022d769925
1 file changed