Merge "Remove MODULE_LICENSE_APACHE2 from Launcher3" am: f6bfbe767f am: 6cf1e6ca36

Change-Id: Iab286e977eab10355aca2df5675e24d6c76a390c