[automerger skipped] Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev am: 20d46e4bf1 -s ours am: a36fc3bb2c -s ours am: 8c17cb7e3d -s ours
am: 8d11b8f9e1 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1 efdcff2452 is in history

Change-Id: Id29733c3ca14165a3f6327ca4045992766757421