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

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

Change-Id: I209007d8742ac5a331b2b19af164944f38ac36ca