tree db825c2958db632c8baf8195cf15a94de1bd2b53
parent 5a07f70d3fc2203559b426a16b752681ae96f7cd
parent 2d509c0ebe27da5c1985b99a395f8c0cfddd6fcd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581020609 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1581020609 +0000

Merge changes from topic "am-6e846588ec5d49759933a1563376ee0c" into oreo-mr1-cts-dev

* changes:
  Merge changes I42e7cc34,I83d9a25f into oreo-cts-dev am: bb3bdb57a1
  [automerger skipped] Revert "DO NOT MERGE CTS: Test column name with spaces" am: 1f4a58b6d9 -s ours am skip reason: subject contains skip directive
  Revert "Strict SQLiteQueryBuilder needs to be stricter." am: 896ac37fdf