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

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



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