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
Change-Id: I3f32851d8126960eb4d5f0b99bb91be5719ae413