Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc

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



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