am 4ad4c4b9: am 12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev

* commit '4ad4c4b997bd96ee09827b39a49fbbb3322690d1':