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

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



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