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