[automerger skipped] Merge changes from topic "sort stats" into pi-dev

am: 664145dcbc  -s ours

Change-Id: Iaf2d41bf8c4464e05f8733d453fcc1a168ef8323
This commit is contained in:
Lorenzo Colitti
2018-11-16 05:41:50 -08:00
committed by android-build-merger

Diff Content Not Available