[automerger skipped] Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into...

[automerger skipped] Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-qpr1-dev am: 5d99f25c am: a97fc79a -s ours

am skip reason: Merged-In I7437dec66f2cfe7769b9448916998c40745c3ebc with SHA-1 fabbcd12 is already in history

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

Change-Id: Ib60f3ddfa72048d5516f77298ad8bba4975a49b8