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

Change-Id: I62c3236de4f0bdf916e690969d110bb3e805fc3d