Merge "Revert "Add com.android.healthfitness to apex_available for andr..."" into main