Merge "Remove MODULE_LICENSE_APACHE2 from DeskClock" am: 1cf83a91be

Change-Id: Ie858f153959a051dcd95c67d9c9608d2ecdeb547