Merge "markVintfStability for priv-apps"