Merge changes If7997341,I7584253b into mainline-prod

* changes:
  Allow wifi p2p to use legacy dedicated address
  Address comment from aosp/1232197
tree: 82ccf2751e114ea4c1726545d1260c5f05bad904
  1. Tethering/