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

Change-Id: Iaa973f4b82d2e54fa479694ce3f1cba3627eeec6