[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 1eb9c759...

[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 1eb9c759 am: f6029c55 am: d0c2ebfc -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/1784792

Change-Id: Ie548804e29c6bdb2d1a60cae120d7fc63b8c6650