This reverts commit c0b6d111. Reason for revert: Breaking SafetySourceBroadcastReceiverTest Bug: 232145041 Change-Id: Ie7019de8f3fe1e11c5b1a59b734ab989668ff875