Merge "Fix Launcher3 gradle file for launcher protos dep" into ub-launcher3-master