Merge "Add TEST_MAPPING" am: d8450bfb2a am: effcfdb5f2

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

Change-Id: I24cbb1df2c6e8a2ca80e03b5d8831042b8ecdfa9