[FP5-2743] mainline_t_2023_nov_t1008511

Change-Id: I0fe601498dad3ddfea98ea13fffe346de0661dae
(cherry picked from commit 9315052f4e3fe5a260286d08e688598f3224e7e3)
diff --git a/current/Android.bp b/current/Android.bp
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/annotation-flags.csv b/current/hiddenapi/annotation-flags.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
old mode 100644
new mode 100755
index 6c077d9..f1578f2
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -39,12 +39,14 @@
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;-><init>(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$Builder;->addParentType(Ljava/lang/String;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->addProperty(Landroid/app/appsearch/AppSearchSchema$PropertyConfig;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->build()Landroid/app/appsearch/AppSearchSchema;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;-><init>(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;-><init>(Ljava/lang/String;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->addIndexableNestedProperties(Ljava/util/Collection;)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setShouldIndexNestedProperties(Z)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,sdk,system-api,test-api
@@ -209,6 +211,11 @@
 Landroid/app/appsearch/PackageIdentifier;->getPackageName()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->getSha256Certificate()[B,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->NON_REPEATED_CARDINALITY:I,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;I)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,sdk,system-api,test-api
@@ -427,6 +434,10 @@
 Landroid/app/appsearch/StorageInfo;->getSizeBytes()J,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/VisibilityDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/VisibilityPermissionDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel;->describeContents()I,public-api,sdk,system-api,test-api
@@ -485,6 +496,7 @@
 Landroid/app/appsearch/observer/SchemaChangeInfo;->getPackageName()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/safeparcel/AbstractSafeParcelable;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Landroid/app/appsearch/GenericDocument;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/util/IndentingStringBuilder;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
old mode 100644
new mode 100755
index 6d4f630..43053b4
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -39,12 +39,14 @@
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;-><init>(Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$Builder;->addParentType(Ljava/lang/String;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->addProperty(Landroid/app/appsearch/AppSearchSchema$PropertyConfig;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->build()Landroid/app/appsearch/AppSearchSchema;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;-><init>(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;-><init>(Ljava/lang/String;Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->addIndexableNestedProperties(Ljava/util/Collection;)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setShouldIndexNestedProperties(Z)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,system-api,test-api
@@ -209,6 +211,11 @@
 Landroid/app/appsearch/PackageIdentifier;->getPackageName()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->getSha256Certificate()[B,public-api,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->NON_REPEATED_CARDINALITY:I,public-api,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;I)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,system-api,test-api
@@ -427,6 +434,10 @@
 Landroid/app/appsearch/StorageInfo;->getSizeBytes()J,public-api,system-api,test-api
 Landroid/app/appsearch/VisibilityDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,system-api,test-api
 Landroid/app/appsearch/VisibilityPermissionDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->describeContents()I,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel;->describeContents()I,public-api,system-api,test-api
@@ -485,6 +496,7 @@
 Landroid/app/appsearch/observer/SchemaChangeInfo;->getPackageName()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/safeparcel/AbstractSafeParcelable;->describeContents()I,public-api,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Landroid/app/appsearch/GenericDocument;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/util/IndentingStringBuilder;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/metadata.csv b/current/hiddenapi/metadata.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
old mode 100644
new mode 100755
diff --git a/current/java_systemserver_libs/snapshot/jars/are/invalid/service-appsearch.jar b/current/java_systemserver_libs/snapshot/jars/are/invalid/service-appsearch.jar
old mode 100644
new mode 100755
diff --git a/current/licenses/packages/modules/AppSearch/NOTICE b/current/licenses/packages/modules/AppSearch/NOTICE
old mode 100644
new mode 100755
diff --git a/current/sdk_library/module-lib/framework-appsearch-removed.txt b/current/sdk_library/module-lib/framework-appsearch-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/module-lib/framework-appsearch-stubs.jar b/current/sdk_library/module-lib/framework-appsearch-stubs.jar
old mode 100644
new mode 100755
index b8cf76a..d0217e2
--- a/current/sdk_library/module-lib/framework-appsearch-stubs.jar
+++ b/current/sdk_library/module-lib/framework-appsearch-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-appsearch.srcjar b/current/sdk_library/module-lib/framework-appsearch.srcjar
old mode 100644
new mode 100755
index 80476e2..833ebd8
--- a/current/sdk_library/module-lib/framework-appsearch.srcjar
+++ b/current/sdk_library/module-lib/framework-appsearch.srcjar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-appsearch.txt b/current/sdk_library/module-lib/framework-appsearch.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/module-lib/framework-appsearch_annotations.zip b/current/sdk_library/module-lib/framework-appsearch_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/public/framework-appsearch-removed.txt b/current/sdk_library/public/framework-appsearch-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/framework-appsearch-stubs.jar b/current/sdk_library/public/framework-appsearch-stubs.jar
old mode 100644
new mode 100755
index cb3fe25..cfc209b
--- a/current/sdk_library/public/framework-appsearch-stubs.jar
+++ b/current/sdk_library/public/framework-appsearch-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-appsearch.srcjar b/current/sdk_library/public/framework-appsearch.srcjar
old mode 100644
new mode 100755
index f01126d..5a6d88f
--- a/current/sdk_library/public/framework-appsearch.srcjar
+++ b/current/sdk_library/public/framework-appsearch.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-appsearch.txt b/current/sdk_library/public/framework-appsearch.txt
old mode 100644
new mode 100755
index 992d9c1..6665c94
--- a/current/sdk_library/public/framework-appsearch.txt
+++ b/current/sdk_library/public/framework-appsearch.txt
@@ -64,6 +64,7 @@
 
   public static final class AppSearchSchema.Builder {
     ctor public AppSearchSchema.Builder(@NonNull String);
+    method @NonNull public android.app.appsearch.AppSearchSchema.Builder addParentType(@NonNull String);
     method @NonNull public android.app.appsearch.AppSearchSchema.Builder addProperty(@NonNull android.app.appsearch.AppSearchSchema.PropertyConfig);
     method @NonNull public android.app.appsearch.AppSearchSchema build();
   }
@@ -84,6 +85,7 @@
 
   public static final class AppSearchSchema.DocumentPropertyConfig.Builder {
     ctor public AppSearchSchema.DocumentPropertyConfig.Builder(@NonNull String, @NonNull String);
+    method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder addIndexableNestedProperties(@NonNull java.util.Collection<java.lang.String>);
     method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig build();
     method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setCardinality(int);
     method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setShouldIndexNestedProperties(boolean);
diff --git a/current/sdk_library/public/framework-appsearch_annotations.zip b/current/sdk_library/public/framework-appsearch_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/system/framework-appsearch-removed.txt b/current/sdk_library/system/framework-appsearch-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/system/framework-appsearch-stubs.jar b/current/sdk_library/system/framework-appsearch-stubs.jar
old mode 100644
new mode 100755
index b8cf76a..d0217e2
--- a/current/sdk_library/system/framework-appsearch-stubs.jar
+++ b/current/sdk_library/system/framework-appsearch-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-appsearch.srcjar b/current/sdk_library/system/framework-appsearch.srcjar
old mode 100644
new mode 100755
index 80476e2..833ebd8
--- a/current/sdk_library/system/framework-appsearch.srcjar
+++ b/current/sdk_library/system/framework-appsearch.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-appsearch.txt b/current/sdk_library/system/framework-appsearch.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/system/framework-appsearch_annotations.zip b/current/sdk_library/system/framework-appsearch_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
old mode 100644
new mode 100755
index d33d0a0..2f619a7
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802
\ No newline at end of file
+10817827
\ No newline at end of file
diff --git a/go/current/Android.bp b/go/current/Android.bp
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/annotation-flags.csv b/go/current/hiddenapi/annotation-flags.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
old mode 100644
new mode 100755
index 6c077d9..f1578f2
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -39,12 +39,14 @@
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;-><init>(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$Builder;->addParentType(Ljava/lang/String;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->addProperty(Landroid/app/appsearch/AppSearchSchema$PropertyConfig;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->build()Landroid/app/appsearch/AppSearchSchema;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;-><init>(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;-><init>(Ljava/lang/String;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->addIndexableNestedProperties(Ljava/util/Collection;)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setShouldIndexNestedProperties(Z)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,sdk,system-api,test-api
@@ -209,6 +211,11 @@
 Landroid/app/appsearch/PackageIdentifier;->getPackageName()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->getSha256Certificate()[B,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->NON_REPEATED_CARDINALITY:I,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;I)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,sdk,system-api,test-api
@@ -427,6 +434,10 @@
 Landroid/app/appsearch/StorageInfo;->getSizeBytes()J,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/VisibilityDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/VisibilityPermissionDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel;->describeContents()I,public-api,sdk,system-api,test-api
@@ -485,6 +496,7 @@
 Landroid/app/appsearch/observer/SchemaChangeInfo;->getPackageName()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/appsearch/safeparcel/AbstractSafeParcelable;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Landroid/app/appsearch/GenericDocument;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/appsearch/util/IndentingStringBuilder;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
old mode 100644
new mode 100755
index 6d4f630..43053b4
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -39,12 +39,14 @@
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BooleanPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;-><init>(Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$Builder;->addParentType(Ljava/lang/String;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->addProperty(Landroid/app/appsearch/AppSearchSchema$PropertyConfig;)Landroid/app/appsearch/AppSearchSchema$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$Builder;->build()Landroid/app/appsearch/AppSearchSchema;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;-><init>(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$BytesPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;-><init>(Ljava/lang/String;Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->addIndexableNestedProperties(Ljava/util/Collection;)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->build()Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setCardinality(I)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,system-api,test-api
 Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;->setShouldIndexNestedProperties(Z)Landroid/app/appsearch/AppSearchSchema$DocumentPropertyConfig$Builder;,public-api,system-api,test-api
@@ -209,6 +211,11 @@
 Landroid/app/appsearch/PackageIdentifier;->getPackageName()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->getSha256Certificate()[B,public-api,system-api,test-api
 Landroid/app/appsearch/PackageIdentifier;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/app/appsearch/PropertyParcelCreator;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->NON_REPEATED_CARDINALITY:I,public-api,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,system-api,test-api
 Landroid/app/appsearch/PropertyPath$PathSegment;->create(Ljava/lang/String;I)Landroid/app/appsearch/PropertyPath$PathSegment;,public-api,system-api,test-api
@@ -427,6 +434,10 @@
 Landroid/app/appsearch/StorageInfo;->getSizeBytes()J,public-api,system-api,test-api
 Landroid/app/appsearch/VisibilityDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,system-api,test-api
 Landroid/app/appsearch/VisibilityPermissionDocument$Builder;->build()Landroid/app/appsearch/GenericDocument;,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->describeContents()I,public-api,system-api,test-api
+Landroid/app/appsearch/aidl/AppSearchAttributionSource;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/appsearch/aidl/AppSearchBatchResultParcel;->describeContents()I,public-api,system-api,test-api
@@ -485,6 +496,7 @@
 Landroid/app/appsearch/observer/SchemaChangeInfo;->getPackageName()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/app/appsearch/observer/SchemaChangeInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/app/appsearch/safeparcel/AbstractSafeParcelable;->describeContents()I,public-api,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Landroid/app/appsearch/GenericDocument;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/util/DocumentIdUtil;->createQualifiedId(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/appsearch/util/IndentingStringBuilder;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/metadata.csv b/go/current/hiddenapi/metadata.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/signature-patterns.csv b/go/current/hiddenapi/signature-patterns.csv
old mode 100644
new mode 100755
diff --git a/go/current/java_systemserver_libs/snapshot/jars/are/invalid/service-appsearch.jar b/go/current/java_systemserver_libs/snapshot/jars/are/invalid/service-appsearch.jar
old mode 100644
new mode 100755
diff --git a/go/current/licenses/packages/modules/AppSearch/NOTICE b/go/current/licenses/packages/modules/AppSearch/NOTICE
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/module-lib/framework-appsearch-removed.txt b/go/current/sdk_library/module-lib/framework-appsearch-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/module-lib/framework-appsearch-stubs.jar b/go/current/sdk_library/module-lib/framework-appsearch-stubs.jar
old mode 100644
new mode 100755
index b8cf76a..d0217e2
--- a/go/current/sdk_library/module-lib/framework-appsearch-stubs.jar
+++ b/go/current/sdk_library/module-lib/framework-appsearch-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/module-lib/framework-appsearch.srcjar b/go/current/sdk_library/module-lib/framework-appsearch.srcjar
old mode 100644
new mode 100755
index 80476e2..833ebd8
--- a/go/current/sdk_library/module-lib/framework-appsearch.srcjar
+++ b/go/current/sdk_library/module-lib/framework-appsearch.srcjar
Binary files differ
diff --git a/go/current/sdk_library/module-lib/framework-appsearch.txt b/go/current/sdk_library/module-lib/framework-appsearch.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/module-lib/framework-appsearch_annotations.zip b/go/current/sdk_library/module-lib/framework-appsearch_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/public/framework-appsearch-removed.txt b/go/current/sdk_library/public/framework-appsearch-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/framework-appsearch-stubs.jar b/go/current/sdk_library/public/framework-appsearch-stubs.jar
old mode 100644
new mode 100755
index cb3fe25..cfc209b
--- a/go/current/sdk_library/public/framework-appsearch-stubs.jar
+++ b/go/current/sdk_library/public/framework-appsearch-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/public/framework-appsearch.srcjar b/go/current/sdk_library/public/framework-appsearch.srcjar
old mode 100644
new mode 100755
index f01126d..5a6d88f
--- a/go/current/sdk_library/public/framework-appsearch.srcjar
+++ b/go/current/sdk_library/public/framework-appsearch.srcjar
Binary files differ
diff --git a/go/current/sdk_library/public/framework-appsearch.txt b/go/current/sdk_library/public/framework-appsearch.txt
old mode 100644
new mode 100755
index 992d9c1..6665c94
--- a/go/current/sdk_library/public/framework-appsearch.txt
+++ b/go/current/sdk_library/public/framework-appsearch.txt
@@ -64,6 +64,7 @@
 
   public static final class AppSearchSchema.Builder {
     ctor public AppSearchSchema.Builder(@NonNull String);
+    method @NonNull public android.app.appsearch.AppSearchSchema.Builder addParentType(@NonNull String);
     method @NonNull public android.app.appsearch.AppSearchSchema.Builder addProperty(@NonNull android.app.appsearch.AppSearchSchema.PropertyConfig);
     method @NonNull public android.app.appsearch.AppSearchSchema build();
   }
@@ -84,6 +85,7 @@
 
   public static final class AppSearchSchema.DocumentPropertyConfig.Builder {
     ctor public AppSearchSchema.DocumentPropertyConfig.Builder(@NonNull String, @NonNull String);
+    method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder addIndexableNestedProperties(@NonNull java.util.Collection<java.lang.String>);
     method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig build();
     method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setCardinality(int);
     method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setShouldIndexNestedProperties(boolean);
diff --git a/go/current/sdk_library/public/framework-appsearch_annotations.zip b/go/current/sdk_library/public/framework-appsearch_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/system/framework-appsearch-removed.txt b/go/current/sdk_library/system/framework-appsearch-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/system/framework-appsearch-stubs.jar b/go/current/sdk_library/system/framework-appsearch-stubs.jar
old mode 100644
new mode 100755
index b8cf76a..d0217e2
--- a/go/current/sdk_library/system/framework-appsearch-stubs.jar
+++ b/go/current/sdk_library/system/framework-appsearch-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-appsearch.srcjar b/go/current/sdk_library/system/framework-appsearch.srcjar
old mode 100644
new mode 100755
index 80476e2..833ebd8
--- a/go/current/sdk_library/system/framework-appsearch.srcjar
+++ b/go/current/sdk_library/system/framework-appsearch.srcjar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-appsearch.txt b/go/current/sdk_library/system/framework-appsearch.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/system/framework-appsearch_annotations.zip b/go/current/sdk_library/system/framework-appsearch_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
old mode 100644
new mode 100755
index d33d0a0..2f619a7
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802
\ No newline at end of file
+10817827
\ No newline at end of file