Merge "Remove special handling of wakeup alarm for car" into qt-dev am: a47901806e
am: 2d10b7eb81

Change-Id: I9e1c2b263cd852d61cf17e673b1e30649edde0ed