[automerger skipped] Merge "Require privapp grants for all launcher3 apps" am: 35d5c05428 am: 3103281161
am: b04a778da6 -s ours
am skip reason: change_id I295ed7f1d65d1e6b4ba6364b2468182353340bbb with SHA1 cff8024a08 is in history

Change-Id: Ifd47df99ab188949ae421ab92ea0d303465ce528