Merge "Fix PlaybackGlueTest on v17" into nyc-support-25.2-dev
am: 28ddb9a0ba

Change-Id: Ib1f4f339560b9b99caa15df6f23afdf1b7616546