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

* changes:
  Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d713 am: bf25aeaa84 am: 4dd2150e42 am: d274ec8859
  [automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a2e -s ours am: 06cf16b862 am: 844fa00afb am: a94619ab62