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

* commit '2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
  Fix memory leak in ApnSettings-activity