Merge "A new workaround for the proguard issue for VDC/AVDC." into nyc-support-25.3-dev
am: 53736a6f3f

Change-Id: I2c93da476af180b6baad64bc4f2a81dc8cbf9efc