[DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab9f am: 6be388d12e

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

Change-Id: Ic5a546db8ccc2e5ff945d69e7a6e33bf7bd3849c