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

Change-Id: I4d0430a6a5b3a1f97cdc4cf9590e5b0a798ae04f