[automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset" am: bdef91f964 -s ours
am: bd5f4328f5 -s ours
am skip reason: subject contains skip directive

Change-Id: I23f3800d8bd6432c7aa9a59ae7cee29e73c7c834