Merge "ConnectivityService: log wakelock activity in dumps" am: db104b2367 am: 146914c0d5 am: bf1b181c63
am: 7346613f27

Change-Id: Id95860ab5d874f24f9fa510a44038ce05bed12f0