[automerger skipped] Merge "Merge "Set default phonebook access to...

[automerger skipped] Merge "Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev am: 4e4b2875 am: 596b6f71 am: 4cbd91c7" into qt-qpr1-dev-plus-aosp
am: 2f6ccca4 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1 810c6d21 is in history

Change-Id: If35a648602eb19f0fc6d7a85aef8556bdd941f88