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