Merge branch 'upstream-master'

* upstream-master:
  Pull upstream changes.

Bug: 146383629
Bug: 143789408
Test: manual 'm -j libicing'
Change-Id: Iaf6e1651711c689a55e08fcdc011a052ef5f7bd7
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..12188f8
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "frameworks/base/apex/appsearch/service/java/com/android/server/appsearch"
+    }
+  ]
+}