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

Change-Id: Ibf9b2387c795384d4121b32c03928e28f9d6e82b
tree: 54538fab1c079872ca82adbcf274e19fdf562be6
  1. service/
  2. PREUPLOAD.cfg