Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." am: f2ab01c09e

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

Change-Id: I15a231d3dbc22577c366c61154e1f5b49ad99f04