Merge "FrameMetricsListener API council changes" into nyc-dev am: 82ee675330
am: 3ad874df28

* commit '3ad874df28dc907a40863d64dd279bc7cb9aaab1':

Change-Id: I0c55dc96ceb96ce00636812a9eb0ade63f18f307