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