Merge "Add L2~L4 information to packet wakeup logs and metrics"
am: 6ee20ca7d3

Change-Id: I8fea75c477d4b5fbbded7dee2dff8644c6f97241