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: 05af56ea
Change-Id: I29f6e7be9903347ac9c8b84cb771c71c56247613