Merge "Add two ServiceState APIs back to @Unsupported list." into rvc-dev