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