Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: 08feabb384

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053