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