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

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



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