Merge "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"
am: 23a18ecd27  -s ours

Change-Id: Iea3c3de0f01ed95c27e66c3e0a56f4b87c3bde46