Correctly remember MAP access selection.

Previously, the MAP access notification used to pop up on every BT
connection. 'Don't ask this again' didn't work. Fix that by correctly
remembering not only the PBAP access selection, but also the MAP access
selection.

Change-Id: I8fb9bedc02f696c9247861eb57ad64c4a8f5f6fa
Profile: respect DPM when overriding screen lock (2/2)

Change-Id: Ia0c2b51cfa35e47328a68366964f231e2bb7ebfa