Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Add a check for full-memory-backup user awareness.

Change-Id: I0a657569d55f0edd620ae86e318886bdce9d2941