Merge "wifi: Fix the Security Report for pending intent" into sc-dev am: 0d6266ee am: 0a0b04f8 am: 96bb8737

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

Change-Id: Ia42b9ae0c45bbb2bee4578ab4a88512751f2aaab