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

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

Change-Id: I3d24b5c68ca741ee3f63bf60623ff7882ea9cc50