Merge "Mark first frames in metrics properly" into sc-dev am: a4d6988f am: 77354cc3 am: b111be8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411196

Change-Id: I7ed4d778a38357a15bc82348eadb500f7d6cb8bb