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

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



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