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

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

Change-Id: I64c9cca0f9b662a5187c8c963ee9b2b31cc9ee49