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