Merge "Revisit the lifetime of the RebootEscrowProvider" am: d746cc814f am: fa83bba5bf

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

Change-Id: I8d476ae93213ff09da715443943482ca436a499f