Merge "Add feature flag to disable wifi AP on the watch." into pi-dev
am: c571b68074

Change-Id: I0d41fcc51b18a6d247caa323b22eb41b61a03888