tree 4d1a8da2ab821dd362ef845a86800f3f7512e800
parent e016e86605bb36e3302900e673de67dc77c891c9
parent fb2acc0f78b4797d74097b9958f1ad8d538d8631
author Chen Xu <fionaxu@google.com> 1641411505 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641411505 +0000

[automerger skipped] Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd am: 3387491083 am: fb2acc0f78 -s ours

am skip reason: Merged-In Iedeb90f186ab9f82894e2fecef86d339c8989542 with SHA-1 40ffe69a3e is already in history

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

Change-Id: I6fe3c30f5c9d71cdd4cccc69c72c6e3f192792c0