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

Change-Id: I00d7c075f3ec1568e3979429ae25d04e9f121ff8