Merge "Use new soong support to install privapp xml"