Sync the code with master branch

Test: I have test this functionality with my CTS Verifier app
Fixes: 184174925
Change-Id: Ia6e64019ed2deb777c513693f10ad78bec4fb0b4

parent 74d4d029

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		return association;
		}
		}));

		restartBleScan();
		}

		@Override