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 am: 06bdb7bd
Change-Id: Ifedf57369c972008be3f529633480fb52953dc52