[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
This commit is contained in: