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

Change-Id: I8677ec2ea60ad04f5ce0eff0a53062e8f3125a92