[automerger] Merge "DO NOT MERGE: Fix android.widget.cts.ToolbarWithMarginsTest" into nougat-mr1-cts-dev am: e675dec5 -s ours am: 451b90be Change-Id: Ib6cb207546ece56ba41bf9e79026e665691fc1ee