Merge "msm: Add a separate config option for RPC PMAPP and RPC USB"