Merge "Only consider the last launched activity for metrics logger" into sc-v2-dev am: f2166b377f am: 4a16cfca04

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

Change-Id: I41108a73c0d3afc607a5eac5193a4db6602458a3