[automerger skipped] Merge "WifiPermissionsUtil: Use getApplicationInfoAsUser for target SDK checks" am: 337fb310d8 -s ours am: 2c9d2a8da9 -s ours
am skip reason: Change-Id I0ff22e39513778b13648b226e91d8a27effc7596 with SHA-1 e0daf722b6 is in history

Change-Id: I7de6d192f02b433b7e58ca706465fa7b74c7a179
tree: 53e21d87416646402dabecaab28b227f84aa7aec
  1. apex/
  2. service/
  3. PREUPLOAD.cfg