[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: Ibafe29acd1f8fe6d00ebddf52bc3a454b02eff4c