Merge "Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184 am: 1040b18dc3" into oc-dr1-dev-plus-aosp
am: 5d6966b46f

Change-Id: I728bd5264e9ef0e137e4db1423ee6ccfd4eecb33