Merge "Fix managed user policy transparency test crash." into pie-cts-dev
am: dd38706da7

Change-Id: I64923244f991f43f333377734df61b56a3cdf5b9