Merge "Diminish the width of magnifier_centered_view in CTS MagnifierTest" am: 17571e3b3c
am: aa943cffd0

Change-Id: I0a61ab88c675e11c17259bbfd3a3ab3683c68ccc