Merge "Remember user choice for phone book access permission dialog"