[automerger skipped] Merge "Drop SMS that starts with VVM prefix even if the...
[automerger skipped] Merge "Drop SMS that starts with VVM prefix even if the filter is not activated" am: feff28f0 am: beeffeb0
am: 852ab76c -s ours
Change-Id: I3ce279b9b8f1c16018efc706ec865016d8ce57a2