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