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

[automerger skipped] [DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab am: 049beecf am: 19a618fc am: fd8753c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I75d12ff02557b2888357c6a742c5ff420f332c01