[automerger skipped] To prevent MMS get the incorrect resource on MSIM device am: 22f372f8b1
am: acda225035 -s ours
am skip reason: change_id I3c51d6e2882596be6dcf660d6903b2cb3e96a6c9 with SHA1 72e1823a18 is in history

Change-Id: I04b3086f12cee11917bf1e92737014323712c783