Merge "Merge "Split toolbar margin test into a separate unit" into nougat-mr1-cts-dev am: b6fc2dfeff  -s ours" into oreo-cts-dev
am: 455b3872b4

Change-Id: Ie89183708d1fbf8a698be1610835552af94385e6