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

Change-Id: I695edafa45fc296fff1b84d786c8a804f5996934