Merge \"Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am: c1720dce1b am: 447ee99755\" into nyc-mr1-dev-plus-aosp
am: 39aa6dc11f

Change-Id: Ib1307bef33373299dc9d8b36144ab300d518e3fd