Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
am: 6976661295
am: 643dd586d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886 Change-Id: I4756745397cdd967dc5ff989445cdcf2dfd76564
This commit is contained in: