Merge changes from topic 'am-ab6fc536-0646-4c6c-ae5a-3c2749ab079f' into ub-launcher3-master

* changes:
  When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684 am: 2d4d1c532d
  When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684