Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev