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