Merge "Comply with the ISystemUiProxy.aidl change"