Merge "Add metrics event for trampoline activity" into oc-dr1-dev
am: 44f7badb73

Change-Id: I7b9bf39041d91b35296952d5e6651ad83e9e81cd