Merge "Add wireless to KeyguardUpdateMonitor isPluggedIn" into jb-mr1-dev