Revert "Strict SQLiteQueryBuilder needs to be stricter." am: 896ac37f am: 0df07365 am: ae54b24a am: 2c422497 Change-Id: I6eaeddc2fca2776269f2c3e803b4e12ae7ad3e1d