This reverts commit 6db77174. Reason for revert: b/138357571 (no signal bars even when device is in service) Change-Id: I98eb708ef4f624bfba541d409837846662255d72