Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
am: cdb70789d7

Change-Id: I9e53821d1cc2666187fd28f05203742c5325381e