Added CMAS/ETWS duplicate expiration support
am: f8247928a2

Change-Id: Ic8ac9c15748ae2a5f22ab08df81ed501a8365bc0