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