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