tree ad5e8d56ad8fcc5920b93a548cfe7d08eb058617
parent b02bb6eca4b89c12d41763220c7688c9cdf7f75d
parent c48e788bad1a1b80e5ad33f0c27338a2746070ec
author Anna Trostanetski <atrost@google.com> 1575392530 -0800
committer android-build-merger <android-build-merger@google.com> 1575392530 -0800

[automerger skipped] Merge "WifiPermissionsUtil: Use getApplicationInfoAsUser for target SDK checks" am: 337fb310d8 -s ours
am: c48e788bad -s ours
am skip reason: change_id I0ff22e39513778b13648b226e91d8a27effc7596 with SHA1 e0daf722b6 is in history

Change-Id: Ic62ca20b2f966904f0559b132b3e5a63f8a7b3b1