Merge changes I8e8799fd,I4626262e

* changes:
  Add DialpadView's OnPreDrawListener in onFinishInflate() to ensure the layout is inflated before adjustments are made.
  Added manifest override for PhoneLookupHistory provider.