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