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

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

Change-Id: I0c1c67e28ee46c7647c9ca07099f5476ed5c0877