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

Merge "[automerger skipped] Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev am: 20d46e4b -s ours am: a36fc3bb -s ours am: 8c17cb7e -s ours am: 8d11b8f9 -s ours
am: b886478a -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1 9b3cb0f0 is in history

Change-Id: Idf91f3b3592afeaee084a622ce7c0629b551816d