Update SQLiteQueryBuilder to match aosp-master and internal master am: 6cbfa79805
am: 69c19ec21b

Change-Id: Ie59e33b896cf8d921e5c67b9d6cfb722bdcbeee8