[automerger skipped] Merge "Add getDefaultDialerPackage which allows a user id...
[automerger skipped] Merge "Add getDefaultDialerPackage which allows a user id to be specified." am: f10eec34 am: 85c80d9c
am: 4d0ad601 -s ours
am skip reason: change_id Id0c2a44519bd44705cd8f63553ce2d76442f0841 with SHA1 93948041 is in history
Change-Id: Iaa4f50a70aaea6465b94e6f3e18cd0217b3617c3