Merge "Merge "Add one more config resource for contacts provider" into qt-dev...
Merge "Merge "Add one more config resource for contacts provider" into qt-dev am: 70554da7 am: 9fe268cc" into qt-r1-dev-plus-aosp
am: 224589e4
Change-Id: Ica57d73c1356a805866de76db05edc226cbc7cd5