Merge "RootlessGpuDebug: Change Activity to Service" into android11-tests-dev