Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Talkback shoudn't announce Photo details twice.

Change-Id: Ie9c30dc007c3f6c32f344c7b1fb3afba9227b82a