Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: cd321d15a4
am: d71accda55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168 Change-Id: I0a5360b854e55ba2c183d6b5b58031ad4f7c629e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: