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

Change-Id: I5a69ba1832036afe1bea0c56bf41f8c718d90eed