Merge "Update to the ActivityManager proto"