[automerger skipped] Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-qpr1-dev am: 5d99f25c9b am: a97fc79ac2 -s ours am: 34316f9385 -s ours
am skip reason: Merged-In I7437dec66f2cfe7769b9448916998c40745c3ebc with SHA-1 fabbcd1247 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684740
Change-Id: I173298947921887209db0d5bff4049cf541227c0
This commit is contained in: