am 371dd500: am c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev

* commit '371dd5003e6c470f7021ad1fb8d2c853ecb5ba98':
  Add near-ultrasound properties to AudioManager.java