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

Change-Id: I36b299235a436070464a59ebe8052d509f431af1