Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Add READ/WRITE_CONTACTS permissions to ContactsProvider
  Update calllogbackup's new package name.

Change-Id: Iaf7592894b66ac88a773a71477ce8a7b67b4faf7