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

Change-Id: Ic13893b4cca32a4e014fc8fb96370ee63234a188