Track our own Dialer with PIB support

Change-Id: Ie1d31ebd2fe3fd6644ad7fd65016548702a1d9ce
Merge upstream