Merge "Comply with the ISystemUiProxy.aidl change" into ub-launcher3-master