Merge "Making wakelock tag in PowerManager dump AUTO." into pi-dev