[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab am: b0054f0518 am: c97dfb57a8 -s ours
am: 40a236db41 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia508b84e09af199cd841d37c89a41c722d63a101