frameworks_opt_telephony: Track remix-staging branch