Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a

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

Change-Id: I8977ef203c363d68c1c43ecd70f530a4924f01b9