Merge "Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e1 am: 1040b18d" into oc-dr1-dev-plus-aosp