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

Change-Id: I748a620b7f1c6e95660b95a067b48f16602de651