Merge "Support parsing legacy reboot escrow data" am: 8d38042009 am: dd36d03799

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0acc30c79574ff6a00cb4cc5334b82d0e9b01e5