[automerger skipped] Merge "Apply security patch to sqlite 3.22" into qt-dev...

[automerger skipped] Merge "Apply security patch to sqlite 3.22" into qt-dev am: 0ed0473a am: ca28674b am: ac4fb0eb -s ours am skip reason: Change-Id Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c with SHA-1 880009be is in history am: a68e10cf -s ours
am skip reason: Change-Id Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c with SHA-1 880009be is in history

Change-Id: I3d081de6e6f500c75388f8aee9ce574e5a2416e7