Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev