Merge "Properly reset doze transition alarms with force-stop" into qt-dev am: 0dc23d780d
am: 39c97daef8

Change-Id: Ia9bf825c25385f182175c24619e30de670bf8f8f