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

Change-Id: I97e3a3e6ca14db04fc82de18503e17e2ede023ce