Merge proposals dependent on lp://qastaging/~mterry/powerd/ussd-turn-on-screen-for-notification

1. ussd-turn-on-screen-for-notification
2. Dependent merge proposals