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

Change-Id: I2b9f16de120628f00e4afa52e9a58b8cfbf8ed85