Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-qpr1-dev am: 5d99f25c9b

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

Change-Id: Ia36e5713e8e4873b6803c990fd708b6e9494a3a5