Merge "Remove MODULE_LICENSE_APACHE2 from BasicSmsReceiver" am: bd13b5cc0e

Change-Id: If48ee09592e5ad13bd3609e8434040051d017574