Merge "Frameworks: Replace deprecated MetricsLogger usage"
am: dbe20066d3

Change-Id: I48ed9bcc0e4851314a2ba437e645b8fd60e5ddbf