Merge "Separate privapp grant for settings.intelligence"
am: 9dbd209353

Change-Id: Ic25745b9079a427ba33b15f2f4b45d400f591d2a