Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE
  Support disabling timer-based lights out
  Add gradle support to photoviewer
  Import translations. DO NOT MERGE

Change-Id: Id6e885d6f7ae3d8eebfed3ff93efb4f2adf20c08