Merge "Fix for leaking BroadcastReceivers" into android13-tests-dev