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

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



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