Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 1e8948fbcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022 Change-Id: Icd20c76b813ec38cc7abe99098c6e59238de47ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: