Merge "Remove the usage of hidden API and fix the test" into sc-dev am: e231dc2b6f am: 00332cab6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185085 Change-Id: I9159d75558dd6954364f631807474602d11153d6
This commit is contained in: