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