Merge "Fix test case failure." into udc-qpr-dev am: b2f436f3

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



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