am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to...
am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '9feab5f2':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()