Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605da0

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

Change-Id: Ib39a4f20c7cd1ca0bc928b22c7c29a5592fbf6ff