Merge "Migrated message duplicate detection to cell broadcast service"
am: c774ff0743

Change-Id: I615da6538c1575c6af11bcfddaf324caa8fa2142