Merge "Add TEST_MAPPING" am: d8450bfb2a am: effcfdb5f2 am: 1c0e1056d9

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

Change-Id: I8e2282314cbd98dc35736078a6909cc0d566a288