Merge "hal: Separate out USB 32 bit 6ch recording policy support"