Merge "When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684" into ub-launcher3-dorval