[automerger skipped] Merge "DO NOT MERGE testMarginsArePercentagesOfContentFrame failed" into oreo-mr1-cts-dev
am: 7f31c988b0 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c8b7a5b375721fb00f56844f815ef506729b604