Merge "Marks deprecated StatsManager APIs." into pi-dev am: 4245b12ef9
am: 09889edcfb

Change-Id: I571ec092ffb9f007be812294e9c7ec47f923c141