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

Change-Id: Id06301715469d915e17d74e5defdd94735f3fc80