Merge "Allow one of description or htmlDescription attribute provided for...
Merge "Allow one of description or htmlDescription attribute provided for AccessibilityShortcutInfo" into rvc-dev am: 61f191f1 am: b119e125 am: 438d3269 am: 399fecc1
Change-Id: I668351dce49986eb69f0439597436c8fc7504b31