am a5aabfeb: Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev

* commit 'a5aabfebcaad34b9fdea222d858fc54d18e462c0':
  Add carrier config variable to hide sim lock setting ui.