[automerger skipped] Merge "Add accessibility timeout video and illustration" am: 1595fc8fc8 am: 95d21e0d44
am: ec6fad2ca2 -s ours
am skip reason: change_id I0e4ba60c934191afbcaddb81e6d07d37244dce64 with SHA1 6838ae7c0b is in history

Change-Id: Idf6348e4304012a6d9ab9911f3cb79229e195093