This partially reverts commit 8561aa3281 because
the added API references the OsuProvider type which is not part of the API.
Bug: 119556446
Test: make droid
Change-Id: Id13857bcb52e715148b06d27cf4096d08f751d37
Exempt-From-Owner-Approval: API only change