[automerger] Merge "DO NOT MERGE: Fix android.widget.cts.ToolbarWithMarginsTest" into nougat-mr1-cts-dev am: e675dec575  -s ours am: 451b90be14 am: 3226af2301 skipped: 0fcb2680f3 am: a46769c231
am: f75c456f79

Change-Id: Ib278fd0c36888e9090be92fc8cdabf97f111c189