Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am:...

Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c970 am: 2d11be89

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168



Change-Id: Ife96f8b3d6237f0520516ffee98f980a9d9c5bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>