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

[automerger skipped] Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-qpr1-dev am: 5d99f25c -s ours am: 2264c0ef -s ours am: f44be7da -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: I279cbcb61c9fa0c56f36bf53b9b1b44bf95ec80c