Merge "correct value of TYPE_MAGNIFICATION_OVERLAY"
am: 9e94328e22

Change-Id: I993c5680157f45e1912e7a24ae5ee1d6cd652f92