Merge "Fix flaky test in BootBroadcastReceiverTest." into main