Merge "Align settings with new mocks" into udc-dev am: 21733fa106
am: 454cfbf2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923 Change-Id: I0f7c5509de3ea5000ca77272c32bb2021992d616 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: