Merge "Don't throw Exception when WakeLockListener throws DeadObject." into udc-dev