Merge "Don't timeout SoftAP if plugged in, regardless of charge" into tm-mainline-prod