Merge "Merge "[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Strict...

Merge "Merge "[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter."" into oreo-cts-dev am: eee700f5 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev am: 2d469e9d -s ours am skip reason: subject contains skip directive" into pie-cts-dev am: adc8e0a5 -s ours
am skip reason: subject contains skip directive

Change-Id: I720203c88567012a7475630caa6ad36272dbf53e