Merge "Separate privapp grant for dialer" am: 5d7fc9568e
am: ce448e631b

Change-Id: Ie21c9f81e3cf92a9c88a10a029bc1eb3f4848f91