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