Merge "Move provider access stats to frameworks/base" into pi-dev