Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799

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



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