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

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

Change-Id: I430d21fda169a79bd43dda8a7080944c196ae4e4