Merge "Add apex_available platform to CtsShimPrivUpgrade" into tm-dev