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

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



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