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

Change-Id: I218eb054ef0da896c72674c597249c6a5120500d