Merge changes from topic "am-cf4a2ab68f0040a6a3e8c5831f3c9efc" into qt-qpr1-dev-plus-aosp

* changes:
  Merge changes from topic "bp-135269143-q" into qt-dev am: 660c3b11c7 am: 58f725221c am: d796dbe3f9
  RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 0e66ea6f32 am: 71765a75d1 am: da99669780