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 am: d4b86cb8
Change-Id: I770fb343e7997b77e202d5dd2de339846a2636cf