Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev