Merge "Merge "Atrace: store app list in multiple sysprops" into nyc-dev am: 9a8ddb6e71 am: afd2089ad4" into nyc-mr1-dev-plus-aosp
am: 83d099be17

* commit '83d099be17b2f6eacb7c988c51bf227901344671':

Change-Id: I384a4b9e55933cbb17423a2e3a62ae27d1f0dd75