Merge "PBAP: Disable SIM card contact supported"
am: 442ad534b7

Change-Id: Id330115b7eb19ce31d076cb7bc7f8a4621239aab