Merge "Added missing A2DP priority on java alarm service" into lmp-dev