[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: d3527bf14b -s ours
am skip reason: subject contains skip directive

Change-Id: Id75f561075c68e4c59c3526768e016bafc265065