Merge "Fix NPE in getCompatibleMagnificationSpecForWindow" into sc-dev am: 55534976 am: 20582b29

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13559219

Change-Id: I80ef5d4ab759f942f214c61d0b956685484e3738