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

Change-Id: I3b05e624a77b66537e458ce87593c9a07058fbe3