[automerger skipped] Merge "Use InboundSmsTracker#getFormat() to get message...
[automerger skipped] Merge "Use InboundSmsTracker#getFormat() to get message format simply" am: a521114a
am: 4b854672 -s ours
am skip reason: change_id Id05dc04e51d7c5186e9e327d9f20a8a14ddaeac1 with SHA1 7d6e3639 is in history
Change-Id: I53d1b8ce10908a8ef46eb7df30b07e66eff20200