Merge "[Media ML] Replace using PendingIntent hidden APIs" into sc-dev