Merge "Make SQLiteDirectCursorDriver @TestApi" into oc-mr1-dev
am: 9b9d310a6d

Change-Id: I69fb3bafc5a77d188e58b11878290da59840b9d5