[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
tree: ad5e8d56ad8fcc5920b93a548cfe7d08eb058617
  1. service/
  2. PREUPLOAD.cfg