[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

Change-Id: Ibfbb76a5d9af019173e6845c08b563a34dbcd67f