Merge "Fix the testcase error" into tm-d1-dev am: 602fe375

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



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