[DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab9f am: 049beecf55

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

Change-Id: I5807284edd64f3388121f2ac90c6e317d6bea17f