Merge "Tweak Alarm Manager tests" into lmp-mr1-dev