Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
am: 2bcd1f3897
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766 Change-Id: If8ec1bb3d52f4254a46d9d21e31ec1a9372978a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: