[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18" into oc-dev am: 715dc1c0 am: 53b65678 am: 673358d1 -s ours am: e4eea4d0 -s ours am: ce4aee1b am: 9b1da0fe

Change-Id: Id242fa4517a6e9922f1f404de175cefc6f187339