am e14151f9: am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev

* commit 'e14151f9c9761d4ccecb9fc677f7b291d287d8e0':
  Work around improper ListView recycling in TrustAgentSettings