Merge "omni: fix using omni charger sound" into android-9.0