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