Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp