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

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

Change-Id: I5f0d6ff24a73b6e22fd64f8cbcae23ca19912966