[automerger skipped] Merge "Ensure we clear magnification specs on non-magnifiable containers." am: b73052d94d am: 6625ced0fd am: 000011d3e8 -s ours
am skip reason: Change-Id I39b43367ac500a5c6c330b5ae3a451345fa5aec4 with SHA-1 7603dea0dd is in history

Change-Id: Ic1608025f374e8853801f4aa8ac83575f96215a3