Merge "Expose Companion API via shell command" into oc-dev

diff --cc services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 16b6ca8,f0af3dd..dc84c45
--- 1/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
--- 2/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@@ -309,9 -306,16 +311,16 @@@ public class CompanionDeviceManagerServ
                      + requiredFeature
                      + " in manifest to use this API");
          }
+ 
+         @Override
+         public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
+                 String[] args, ShellCallback callback, ResultReceiver resultReceiver)
+                 throws RemoteException {
+             new ShellCmd().exec(this, in, out, err, args, callback, resultReceiver);
+         }
      }
  
 -    private int getCallingUserId() {
 +    private static int getCallingUserId() {
          return UserHandle.getUserId(Binder.getCallingUid());
      }