am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

* commit 'f4ada994f91bcdfcb421d76faa8ea84540815e7c':
  Fix an incorrect behavior that failed AT&T privacy test.