Merge "Enable MEDIA_DEVICE_NAME_FIX for droidfood" into main