Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: testMarginsArePercentagesOfContentFrame failed" into pie-cts-dev am: 24d920ec7f -s ours
am: a333994fb5 -s ours
am skip reason: subject contains skip directive

Change-Id: I24a16ae01e65974d14719dfa799cd8234540e8ba