Merge "p2p: add MANAGE_WIFI_AUTO_JOIN permission for CTS external approver tests" am: 2a491d487f am: 7faee6e286

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

Change-Id: Id4e8c1ecf51c89454142c3b8e5f9eed18d076f12