Merge "Add metrics constant for wifi scanning dialog" into pi-dev am: 0b17eb5f4a
am: d1b6fe23b8

Change-Id: Iae1f59b3c5bd0f262d5f6cb46c72e18661f1e79e