Merge "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" into oreo-mr1-cts-dev
am: b6a04716a2  -s ours

Change-Id: Ifc92b2696316852b4636784f9f05b481df689e70