Merge "Add null check in hideEnhanced4gLteSettings." am: cabd0fa1a5 am: f65eaa21b2
am: 8badf9f103  -s ours

Change-Id: Id3c88767a9eda92444736b8d0a9c5ce12f4f134c