Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  DO NOT MERGE. Fixed emergency alert TTS not playing on bluetooth speaker.
  Fixed that emergency alert reminder does not trigger every 2 minutes.
  Fixed that "Turn on notification" does not work.

Change-Id: Ie67c5bec6b7c0e61ffb2126921f6a060f16afd1c