Merge "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test" am: 1bf4072c...

Merge "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test" am: 1bf4072c am: a29505af am: a6b28ca5 am: f1223c17

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



Change-Id: I794b9eb7a6172c466175521a1c944f0120882143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>