am c5fc6231: am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"

* commit 'c5fc6231312b21efb601367bae28d63f9b26ac52':
  Fix memory leak in ApnSettings-activity