Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: c14daa817b
am: c88e678aa9
am: 6a2327f7fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723 Change-Id: Icc30eabadc43e4d0435cefc890655d4fdd18f110 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: