Merge "Add DIALOG_UPDATABLE_LIST_PREFERENCE into metrics_constants.proto" into pi-dev am: cdf52becfe
am: 05d1841f65

Change-Id: I6b68c80bb8682e14d0c8f01b47dae7bdda3e4ca2