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

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: 76c46683 am: c1298a74 am: 3d86cac6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iad721eb82cac9c4e20c9b1344d23e94ee3eef091