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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4def0ebbf3f8c9e068fd768a090b25ee04333333