Merge "Fixes broken Settings test." into udc-dev am: 01c585ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419



Change-Id: I2b0bf456f6f494de4f626f93320a0bef8051b6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>