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: Id825df456f83a426f31af79c28ebdadf7f4b93ec