[automerger skipped] Merge "Separate privapp grant for settings.intelligence" am: 9dbd209353 am: 1cec259232
am: 306faca39a -s ours
am skip reason: change_id I994137279b2c25938fd9967027f606a88bb39468 with SHA1 1e4e66e756 is in history

Change-Id: I2ead39af3a8b8d363c8edbd2503e45b0c87b6277