Merge "Merge "atrace: read package names from multiple sysprops" into nyc-dev am: d7dfadbd4c am: 4a5736c08a" into nyc-mr1-dev-plus-aosp