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

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



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