Merge "DO NOT MERGE: Fix android.widget.cts.ToolbarWithMarginsTest" into nougat-mr1-cts-dev
am: e675dec575  -s ours

Change-Id: I2648207354a7386ad3d356e12b57e6200f62d331