Merge "Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea am: ba15163b2a" into nyc-mr1-dev-plus-aosp