Merge "Add null check in hideEnhanced4gLteSettings." am: cabd0fa1a5
am: f65eaa21b2

Change-Id: Idc3224751c04f39930523a4da0cf1c8f8e0a6aa5