Merge "DO NOT MERGE testMarginsArePercentagesOfContentFrame failed" into oreo-mr1-cts-dev