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