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