am 9b984db3: am 5feb666d: Merge "Enable CSP feature for AT&T and AIO SIMs" into lmp-dev

* commit '9b984db3b3ec09c4d20b08eeefea45dfc6d67230':
  Enable CSP feature for AT&T and AIO SIMs