Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: e25656bf3f am: 40f3fc08e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419 Change-Id: I32a33d4198e71717fba6be71ea08905e1f5350e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: