am ca8935c0: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev

* commit 'ca8935c0e1fb75ed5656dcce9a945b0491ed5b26':