Merge "When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684" into ub-launcher3-dorval am: 904a38340c
am: 4de0ddc4f1

Change-Id: I93e24c7a2d6c87f4511dc22189cb109d19212dc9