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

Change-Id: I665660fa8ccf68d80c1ba315772b52d38d2bc87d