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 am: 7708139aa7 am: 1201049910
am: 89722cf5ef

Change-Id: Ic6c7739339f761b7371cf3899ab9d8106836685d