diff --git a/current/module-lib/android-non-updatable.jar b/current/module-lib/android-non-updatable.jar
index bc72eaf..232b5d1 100644
--- a/current/module-lib/android-non-updatable.jar
+++ b/current/module-lib/android-non-updatable.jar
Binary files differ
diff --git a/current/module-lib/android.jar b/current/module-lib/android.jar
index 2279ef8..1bc3cd7 100644
--- a/current/module-lib/android.jar
+++ b/current/module-lib/android.jar
Binary files differ
diff --git a/current/public/android-non-updatable.jar b/current/public/android-non-updatable.jar
index 47eec69..a217e8b 100644
--- a/current/public/android-non-updatable.jar
+++ b/current/public/android-non-updatable.jar
Binary files differ
diff --git a/current/public/android.jar b/current/public/android.jar
index 211b3bd..32d7c47 100644
--- a/current/public/android.jar
+++ b/current/public/android.jar
Binary files differ
diff --git a/current/public/data/annotations.zip b/current/public/data/annotations.zip
index 4513cc7..3d8a0bb 100644
--- a/current/public/data/annotations.zip
+++ b/current/public/data/annotations.zip
Binary files differ
diff --git a/current/public/data/api-versions-filtered.xml b/current/public/data/api-versions-filtered.xml
index f2b499b..02d77f5 100644
--- a/current/public/data/api-versions-filtered.xml
+++ b/current/public/data/api-versions-filtered.xml
@@ -114,6 +114,7 @@
 		<field name="INTERNAL_SYSTEM_WINDOW" removed="23" />
 		<field name="INTERNET" />
 		<field name="KILL_BACKGROUND_PROCESSES" since="8" />
+		<field name="LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" since="33" />
 		<field name="LOADER_USAGE_STATS" since="30" />
 		<field name="LOCATION_HARDWARE" since="18" />
 		<field name="MANAGE_ACCOUNTS" since="5" removed="23" />
@@ -1359,6 +1360,7 @@
 		<field name="shortcutLongLabel" since="25" />
 		<field name="shortcutShortLabel" since="25" />
 		<field name="shouldDisableView" />
+		<field name="shouldUseDefaultUnfoldTransition" since="33" />
 		<field name="showAsAction" since="11" />
 		<field name="showDefault" />
 		<field name="showDividers" since="11" />
@@ -2074,6 +2076,9 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init&gt;()V" />
 		<field name="accessibilityActionContextClick" since="23" />
+		<field name="accessibilityActionDragCancel" since="33" />
+		<field name="accessibilityActionDragDrop" since="33" />
+		<field name="accessibilityActionDragStart" since="33" />
 		<field name="accessibilityActionHideTooltip" since="28" />
 		<field name="accessibilityActionImeEnter" since="30" />
 		<field name="accessibilityActionMoveWindow" since="26" />
@@ -6655,6 +6660,7 @@
 	</class>
 	<class name="android/app/TaskInfo" since="29">
 		<extends name="java/lang/Object" />
+		<method name="isVisible()Z" since="33" />
 		<field name="baseActivity" />
 		<field name="baseIntent" />
 		<field name="isRunning" />
@@ -6867,6 +6873,7 @@
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
 		<method name="loadThumbnail(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
+		<method name="shouldUseDefaultUnfoldTransition()Z" since="33" />
 		<method name="supportsMultipleDisplays()Z" since="29" />
 		<field name="CREATOR" />
 	</class>
@@ -17510,6 +17517,7 @@
 		<field name="EDGE_AVAILABLE_EDGE_MODES" />
 		<field name="FLASH_INFO_AVAILABLE" />
 		<field name="HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES" />
+		<field name="INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP" since="33" />
 		<field name="INFO_SUPPORTED_HARDWARE_LEVEL" />
 		<field name="INFO_VERSION" since="28" />
 		<field name="JPEG_AVAILABLE_THUMBNAIL_SIZES" />
@@ -18195,6 +18203,12 @@
 		<method name="copyElements([Landroid/util/Rational;I)V" />
 		<method name="getElement(II)Landroid/util/Rational;" />
 	</class>
+	<class name="android/hardware/camera2/params/DeviceStateSensorOrientationMap" since="33">
+		<extends name="java/lang/Object" />
+		<method name="getSensorOrientation(J)I" />
+		<field name="FOLDED" />
+		<field name="NORMAL" />
+	</class>
 	<class name="android/hardware/camera2/params/ExtensionSessionConfiguration" since="31">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init&gt;(ILjava/util/List;Ljava/util/concurrent/Executor;Landroid/hardware/camera2/CameraExtensionSession$StateCallback;)V" />
@@ -19695,8 +19709,10 @@
 		<method name="getAllowedCapturePolicy()I" since="29" />
 		<method name="getContentType()I" />
 		<method name="getFlags()I" />
+		<method name="getSpatializationBehavior()I" since="33" />
 		<method name="getUsage()I" />
 		<method name="getVolumeControlStream()I" since="26" />
+		<method name="isContentSpatialized()Z" since="33" />
 		<field name="ALLOW_CAPTURE_BY_ALL" since="29" />
 		<field name="ALLOW_CAPTURE_BY_NONE" since="29" />
 		<field name="ALLOW_CAPTURE_BY_SYSTEM" since="29" />
@@ -19709,6 +19725,8 @@
 		<field name="FLAG_AUDIBILITY_ENFORCED" />
 		<field name="FLAG_HW_AV_SYNC" />
 		<field name="FLAG_LOW_LATENCY" since="24" deprecated="26" />
+		<field name="SPATIALIZATION_BEHAVIOR_AUTO" since="33" />
+		<field name="SPATIALIZATION_BEHAVIOR_NEVER" since="33" />
 		<field name="USAGE_ALARM" />
 		<field name="USAGE_ASSISTANCE_ACCESSIBILITY" />
 		<field name="USAGE_ASSISTANCE_NAVIGATION_GUIDANCE" />
@@ -19735,7 +19753,9 @@
 		<method name="setContentType(I)Landroid/media/AudioAttributes$Builder;" />
 		<method name="setFlags(I)Landroid/media/AudioAttributes$Builder;" />
 		<method name="setHapticChannelsMuted(Z)Landroid/media/AudioAttributes$Builder;" since="29" />
+		<method name="setIsContentSpatialized(Z)Landroid/media/AudioAttributes$Builder;" since="33" />
 		<method name="setLegacyStreamType(I)Landroid/media/AudioAttributes$Builder;" />
+		<method name="setSpatializationBehavior(I)Landroid/media/AudioAttributes$Builder;" since="33" />
 		<method name="setUsage(I)Landroid/media/AudioAttributes$Builder;" />
 	</class>
 	<class name="android/media/AudioDescriptor" since="31">
@@ -19852,24 +19872,45 @@
 		<field name="CHANNEL_IN_Y_AXIS" since="5" />
 		<field name="CHANNEL_IN_Z_AXIS" since="5" />
 		<field name="CHANNEL_OUT_5POINT1" since="5" />
+		<field name="CHANNEL_OUT_5POINT1POINT2" since="33" />
+		<field name="CHANNEL_OUT_5POINT1POINT4" since="33" />
 		<field name="CHANNEL_OUT_7POINT1" since="5" deprecated="23" />
+		<field name="CHANNEL_OUT_7POINT1POINT2" since="33" />
+		<field name="CHANNEL_OUT_7POINT1POINT4" since="33" />
 		<field name="CHANNEL_OUT_7POINT1_SURROUND" since="23" />
+		<field name="CHANNEL_OUT_9POINT1POINT4" since="33" />
+		<field name="CHANNEL_OUT_9POINT1POINT6" since="33" />
 		<field name="CHANNEL_OUT_BACK_CENTER" since="5" />
 		<field name="CHANNEL_OUT_BACK_LEFT" since="5" />
 		<field name="CHANNEL_OUT_BACK_RIGHT" since="5" />
+		<field name="CHANNEL_OUT_BOTTOM_FRONT_CENTER" since="33" />
+		<field name="CHANNEL_OUT_BOTTOM_FRONT_LEFT" since="33" />
+		<field name="CHANNEL_OUT_BOTTOM_FRONT_RIGHT" since="33" />
 		<field name="CHANNEL_OUT_DEFAULT" since="5" />
 		<field name="CHANNEL_OUT_FRONT_CENTER" since="5" />
 		<field name="CHANNEL_OUT_FRONT_LEFT" since="5" />
 		<field name="CHANNEL_OUT_FRONT_LEFT_OF_CENTER" since="5" />
 		<field name="CHANNEL_OUT_FRONT_RIGHT" since="5" />
 		<field name="CHANNEL_OUT_FRONT_RIGHT_OF_CENTER" since="5" />
+		<field name="CHANNEL_OUT_FRONT_WIDE_LEFT" since="33" />
+		<field name="CHANNEL_OUT_FRONT_WIDE_RIGHT" since="33" />
 		<field name="CHANNEL_OUT_LOW_FREQUENCY" since="5" />
+		<field name="CHANNEL_OUT_LOW_FREQUENCY_2" since="33" />
 		<field name="CHANNEL_OUT_MONO" since="5" />
 		<field name="CHANNEL_OUT_QUAD" since="5" />
 		<field name="CHANNEL_OUT_SIDE_LEFT" since="21" />
 		<field name="CHANNEL_OUT_SIDE_RIGHT" since="21" />
 		<field name="CHANNEL_OUT_STEREO" since="5" />
 		<field name="CHANNEL_OUT_SURROUND" since="5" />
+		<field name="CHANNEL_OUT_TOP_BACK_CENTER" since="33" />
+		<field name="CHANNEL_OUT_TOP_BACK_LEFT" since="33" />
+		<field name="CHANNEL_OUT_TOP_BACK_RIGHT" since="33" />
+		<field name="CHANNEL_OUT_TOP_CENTER" since="33" />
+		<field name="CHANNEL_OUT_TOP_FRONT_CENTER" since="33" />
+		<field name="CHANNEL_OUT_TOP_FRONT_LEFT" since="33" />
+		<field name="CHANNEL_OUT_TOP_FRONT_RIGHT" since="33" />
+		<field name="CHANNEL_OUT_TOP_SIDE_LEFT" since="33" />
+		<field name="CHANNEL_OUT_TOP_SIDE_RIGHT" since="33" />
 		<field name="CREATOR" since="24" />
 		<field name="ENCODING_AAC_ELD" since="28" />
 		<field name="ENCODING_AAC_HE_V1" since="28" />
@@ -19939,6 +19980,7 @@
 		<method name="getProperty(Ljava/lang/String;)Ljava/lang/String;" since="17" />
 		<method name="getRingerMode()I" />
 		<method name="getRouting(I)I" deprecated="15" />
+		<method name="getSpatializer()Landroid/media/Spatializer;" since="33" />
 		<method name="getStreamMaxVolume(I)I" />
 		<method name="getStreamMinVolume(I)I" since="28" />
 		<method name="getStreamVolume(I)I" />
@@ -22042,6 +22084,7 @@
 		<field name="KEY_MAX_FPS_TO_ENCODER" since="29" />
 		<field name="KEY_MAX_HEIGHT" since="19" />
 		<field name="KEY_MAX_INPUT_SIZE" />
+		<field name="KEY_MAX_OUTPUT_CHANNEL_COUNT" since="33" />
 		<field name="KEY_MAX_PTS_GAP_TO_ENCODER" since="29" />
 		<field name="KEY_MAX_WIDTH" since="19" />
 		<field name="KEY_MIME" />
@@ -23290,6 +23333,22 @@
 		<extends name="java/lang/Object" />
 		<method name="onLoadComplete(Landroid/media/SoundPool;II)V" />
 	</class>
+	<class name="android/media/Spatializer" since="33">
+		<extends name="java/lang/Object" />
+		<method name="addOnSpatializerStateChangedListener(Ljava/util/concurrent/Executor;Landroid/media/Spatializer$OnSpatializerStateChangedListener;)V" />
+		<method name="canBeSpatialized(Landroid/media/AudioAttributes;Landroid/media/AudioFormat;)Z" />
+		<method name="getImmersiveAudioLevel()I" />
+		<method name="isAvailable()Z" />
+		<method name="isEnabled()Z" />
+		<method name="removeOnSpatializerStateChangedListener(Landroid/media/Spatializer$OnSpatializerStateChangedListener;)V" />
+		<field name="SPATIALIZER_IMMERSIVE_LEVEL_MULTICHANNEL" />
+		<field name="SPATIALIZER_IMMERSIVE_LEVEL_NONE" />
+		<field name="SPATIALIZER_IMMERSIVE_LEVEL_OTHER" />
+	</class>
+	<class name="android/media/Spatializer$OnSpatializerStateChangedListener" since="33">
+		<method name="onSpatializerAvailableChanged(Landroid/media/Spatializer;Z)V" />
+		<method name="onSpatializerEnabledChanged(Landroid/media/Spatializer;Z)V" />
+	</class>
 	<class name="android/media/SubtitleData" since="28">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init&gt;(IJJ[B)V" since="29" />
@@ -30148,6 +30207,7 @@
 		<field name="Q" since="29" />
 		<field name="R" since="30" />
 		<field name="S" since="31" />
+		<field name="S_V2" since="33" />
 	</class>
 	<class name="android/os/Bundle" since="1">
 		<extends name="android/os/BaseBundle" since="21" />
@@ -34798,6 +34858,7 @@
 		<field name="ACTION_SEARCH_SETTINGS" since="8" />
 		<field name="ACTION_SECURITY_SETTINGS" />
 		<field name="ACTION_SETTINGS" />
+		<field name="ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY" since="33" />
 		<field name="ACTION_SHOW_REGULATORY_INFO" since="21" />
 		<field name="ACTION_SHOW_WORK_POLICY_INFO" since="30" />
 		<field name="ACTION_SOUND_SETTINGS" />
@@ -34838,6 +34899,8 @@
 		<field name="EXTRA_EASY_CONNECT_ERROR_CODE" since="30" />
 		<field name="EXTRA_INPUT_METHOD_ID" since="11" />
 		<field name="EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME" since="30" />
+		<field name="EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY" since="33" />
+		<field name="EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI" since="33" />
 		<field name="EXTRA_SUB_ID" since="28" />
 		<field name="EXTRA_WIFI_NETWORK_LIST" since="30" />
 		<field name="EXTRA_WIFI_NETWORK_RESULT_LIST" since="30" />
@@ -38856,6 +38919,12 @@
 		<method name="getEnd()I" />
 		<method name="getStart()I" />
 	</class>
+	<class name="android/service/voice/VisibleActivityInfo" since="33">
+		<extends name="java/lang/Object" />
+		<implements name="android/os/Parcelable" />
+		<method name="getActivityId()Landroid/service/voice/VoiceInteractionSession$ActivityId;" />
+		<field name="CREATOR" />
+	</class>
 	<class name="android/service/voice/VoiceInteractionService" since="21">
 		<extends name="android/app/Service" />
 		<method name="&lt;init&gt;()V" />
@@ -38915,6 +38984,7 @@
 		<method name="onTaskFinished(Landroid/content/Intent;I)V" since="23" />
 		<method name="onTaskStarted(Landroid/content/Intent;I)V" since="23" />
 		<method name="performDirectAction(Landroid/app/DirectAction;Landroid/os/Bundle;Landroid/os/CancellationSignal;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V" since="29" />
+		<method name="registerVisibleActivityCallback(Ljava/util/concurrent/Executor;Landroid/service/voice/VoiceInteractionSession$VisibleActivityCallback;)V" since="33" />
 		<method name="requestDirectActions(Landroid/service/voice/VoiceInteractionSession$ActivityId;Landroid/os/CancellationSignal;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V" since="29" />
 		<method name="setContentView(Landroid/view/View;)V" />
 		<method name="setDisabledShowContext(I)V" since="23" />
@@ -38924,6 +38994,7 @@
 		<method name="show(Landroid/os/Bundle;I)V" since="23" />
 		<method name="startAssistantActivity(Landroid/content/Intent;)V" since="26" />
 		<method name="startVoiceActivity(Landroid/content/Intent;)V" since="23" />
+		<method name="unregisterVisibleActivityCallback(Landroid/service/voice/VoiceInteractionSession$VisibleActivityCallback;)V" since="33" />
 		<field name="SHOW_SOURCE_ACTIVITY" since="24" />
 		<field name="SHOW_SOURCE_APPLICATION" since="23" />
 		<field name="SHOW_SOURCE_ASSIST_GESTURE" since="23" />
@@ -38996,6 +39067,10 @@
 		<method name="getExtras()Landroid/os/Bundle;" />
 		<method name="isActive()Z" />
 	</class>
+	<class name="android/service/voice/VoiceInteractionSession$VisibleActivityCallback" since="33">
+		<method name="onInvisible(Landroid/service/voice/VoiceInteractionSession$ActivityId;)V" />
+		<method name="onVisible(Landroid/service/voice/VisibleActivityInfo;)V" />
+	</class>
 	<class name="android/service/voice/VoiceInteractionSessionService" since="21">
 		<extends name="android/app/Service" />
 		<method name="&lt;init&gt;()V" />
@@ -44338,140 +44413,140 @@
 	</class>
 	<class name="android/test/ActivityInstrumentationTestCase" since="1" deprecated="3">
 		<extends name="android/test/ActivityTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;Z)V" deprecated="32" />
-		<method name="testActivityTestCaseSetUpProperly()V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;Z)V" deprecated="33" />
+		<method name="testActivityTestCaseSetUpProperly()V" deprecated="33" />
 	</class>
 	<class name="android/test/ActivityInstrumentationTestCase2" since="3" deprecated="24">
 		<extends name="android/test/ActivityTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;)V" since="8" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;)V" since="8" deprecated="33" />
 		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="15" />
-		<method name="setActivityInitialTouchMode(Z)V" deprecated="32" />
-		<method name="setActivityIntent(Landroid/content/Intent;)V" deprecated="32" />
+		<method name="setActivityInitialTouchMode(Z)V" deprecated="33" />
+		<method name="setActivityIntent(Landroid/content/Intent;)V" deprecated="33" />
 	</class>
 	<class name="android/test/ActivityTestCase" since="1" deprecated="24">
 		<extends name="android/test/InstrumentationTestCase" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="getActivity()Landroid/app/Activity;" deprecated="32" />
-		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="setActivity(Landroid/app/Activity;)V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="getActivity()Landroid/app/Activity;" deprecated="33" />
+		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="setActivity(Landroid/app/Activity;)V" deprecated="33" />
 	</class>
 	<class name="android/test/ActivityUnitTestCase" since="1" deprecated="24">
 		<extends name="android/test/ActivityTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="getFinishedActivityRequest()I" deprecated="32" />
-		<method name="getRequestedOrientation()I" deprecated="32" />
-		<method name="getStartedActivityIntent()Landroid/content/Intent;" deprecated="32" />
-		<method name="getStartedActivityRequest()I" deprecated="32" />
-		<method name="isFinishCalled()Z" deprecated="32" />
-		<method name="setActivityContext(Landroid/content/Context;)V" deprecated="32" />
-		<method name="setApplication(Landroid/app/Application;)V" deprecated="32" />
-		<method name="startActivity(Landroid/content/Intent;Landroid/os/Bundle;Ljava/lang/Object;)Landroid/app/Activity;" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="getFinishedActivityRequest()I" deprecated="33" />
+		<method name="getRequestedOrientation()I" deprecated="33" />
+		<method name="getStartedActivityIntent()Landroid/content/Intent;" deprecated="33" />
+		<method name="getStartedActivityRequest()I" deprecated="33" />
+		<method name="isFinishCalled()Z" deprecated="33" />
+		<method name="setActivityContext(Landroid/content/Context;)V" deprecated="33" />
+		<method name="setApplication(Landroid/app/Application;)V" deprecated="33" />
+		<method name="startActivity(Landroid/content/Intent;Landroid/os/Bundle;Ljava/lang/Object;)Landroid/app/Activity;" deprecated="33" />
 	</class>
 	<class name="android/test/AndroidTestCase" since="1" deprecated="24">
 		<extends name="junit/framework/TestCase" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="assertActivityRequiresPermission(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" since="4" deprecated="32" />
-		<method name="assertReadingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="32" />
-		<method name="assertWritingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="32" />
-		<method name="getContext()Landroid/content/Context;" deprecated="32" />
-		<method name="getTestContext()Landroid/content/Context;" since="32" deprecated="32" />
-		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="setContext(Landroid/content/Context;)V" deprecated="32" />
-		<method name="setTestContext(Landroid/content/Context;)V" since="32" deprecated="32" />
-		<method name="testAndroidTestCaseSetupProperly()V" deprecated="32" />
-		<field name="mContext" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="assertActivityRequiresPermission(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" since="4" deprecated="33" />
+		<method name="assertReadingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="33" />
+		<method name="assertWritingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="33" />
+		<method name="getContext()Landroid/content/Context;" deprecated="33" />
+		<method name="getTestContext()Landroid/content/Context;" since="33" deprecated="33" />
+		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="setContext(Landroid/content/Context;)V" deprecated="33" />
+		<method name="setTestContext(Landroid/content/Context;)V" since="33" deprecated="33" />
+		<method name="testAndroidTestCaseSetupProperly()V" deprecated="33" />
+		<field name="mContext" deprecated="33" />
 	</class>
 	<class name="android/test/AndroidTestRunner" since="1" deprecated="24">
 		<extends name="junit/runner/BaseTestRunner" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="addTestListener(Ljunit/framework/TestListener;)V" deprecated="32" />
-		<method name="clearTestListeners()V" deprecated="32" />
-		<method name="createTestResult()Ljunit/framework/TestResult;" deprecated="32" />
-		<method name="getTestCases()Ljava/util/List;" deprecated="32" />
-		<method name="getTestClassName()Ljava/lang/String;" deprecated="32" />
-		<method name="getTestResult()Ljunit/framework/TestResult;" deprecated="32" />
-		<method name="runTest()V" deprecated="32" />
-		<method name="runTest(Ljunit/framework/TestResult;)V" deprecated="32" />
-		<method name="setContext(Landroid/content/Context;)V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="addTestListener(Ljunit/framework/TestListener;)V" deprecated="33" />
+		<method name="clearTestListeners()V" deprecated="33" />
+		<method name="createTestResult()Ljunit/framework/TestResult;" deprecated="33" />
+		<method name="getTestCases()Ljava/util/List;" deprecated="33" />
+		<method name="getTestClassName()Ljava/lang/String;" deprecated="33" />
+		<method name="getTestResult()Ljunit/framework/TestResult;" deprecated="33" />
+		<method name="runTest()V" deprecated="33" />
+		<method name="runTest(Ljunit/framework/TestResult;)V" deprecated="33" />
+		<method name="setContext(Landroid/content/Context;)V" deprecated="33" />
 		<method name="setInstrumentaiton(Landroid/app/Instrumentation;)V" deprecated="15" />
-		<method name="setInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="32" />
-		<method name="setTest(Ljunit/framework/Test;)V" deprecated="32" />
-		<method name="setTestClassName(Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
+		<method name="setInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="33" />
+		<method name="setTest(Ljunit/framework/Test;)V" deprecated="33" />
+		<method name="setTestClassName(Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
 	</class>
 	<class name="android/test/ApplicationTestCase" since="1" deprecated="24">
 		<extends name="android/test/AndroidTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="createApplication()V" deprecated="32" />
-		<method name="getApplication()Landroid/app/Application;" deprecated="32" />
-		<method name="getSystemContext()Landroid/content/Context;" deprecated="32" />
-		<method name="terminateApplication()V" deprecated="32" />
-		<method name="testApplicationTestCaseSetUpProperly()V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="createApplication()V" deprecated="33" />
+		<method name="getApplication()Landroid/app/Application;" deprecated="33" />
+		<method name="getSystemContext()Landroid/content/Context;" deprecated="33" />
+		<method name="terminateApplication()V" deprecated="33" />
+		<method name="testApplicationTestCaseSetUpProperly()V" deprecated="33" />
 	</class>
 	<class name="android/test/AssertionFailedError" since="1" deprecated="16">
 		<extends name="java/lang/Error" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/String;)V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/String;)V" deprecated="33" />
 	</class>
 	<class name="android/test/ComparisonFailure" since="1" deprecated="16">
 		<extends name="android/test/AssertionFailedError" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
 	</class>
 	<class name="android/test/FlakyTest" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
-		<method name="tolerance()I" deprecated="32" />
+		<method name="tolerance()I" deprecated="33" />
 	</class>
 	<class name="android/test/InstrumentationTestCase" since="1" deprecated="24">
 		<extends name="junit/framework/TestCase" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="getInstrumentation()Landroid/app/Instrumentation;" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="getInstrumentation()Landroid/app/Instrumentation;" deprecated="33" />
 		<method name="injectInsrumentation(Landroid/app/Instrumentation;)V" deprecated="15" />
-		<method name="injectInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="32" />
-		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)Landroid/app/Activity;" deprecated="32" />
-		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)Landroid/app/Activity;" since="3" deprecated="32" />
-		<method name="runTestOnUiThread(Ljava/lang/Runnable;)V" since="3" deprecated="32" />
-		<method name="sendKeys(Ljava/lang/String;)V" deprecated="32" />
-		<method name="sendKeys([I)V" deprecated="32" />
-		<method name="sendRepeatedKeys([I)V" deprecated="32" />
+		<method name="injectInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="33" />
+		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)Landroid/app/Activity;" deprecated="33" />
+		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)Landroid/app/Activity;" since="3" deprecated="33" />
+		<method name="runTestOnUiThread(Ljava/lang/Runnable;)V" since="3" deprecated="33" />
+		<method name="sendKeys(Ljava/lang/String;)V" deprecated="33" />
+		<method name="sendKeys([I)V" deprecated="33" />
+		<method name="sendRepeatedKeys([I)V" deprecated="33" />
 	</class>
 	<class name="android/test/InstrumentationTestRunner" since="1" deprecated="24">
 		<extends name="android/app/Instrumentation" />
 		<implements name="android/test/TestSuiteProvider" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="addTestListener(Ljunit/framework/TestListener;)V" since="32" deprecated="32" />
-		<method name="getAllTests()Ljunit/framework/TestSuite;" deprecated="32" />
-		<method name="getAndroidTestRunner()Landroid/test/AndroidTestRunner;" deprecated="32" />
-		<method name="getArguments()Landroid/os/Bundle;" since="18" deprecated="32" />
-		<method name="getLoader()Ljava/lang/ClassLoader;" deprecated="32" />
-		<field name="REPORT_KEY_NAME_CLASS" deprecated="32" />
-		<field name="REPORT_KEY_NAME_TEST" deprecated="32" />
-		<field name="REPORT_KEY_NUM_CURRENT" deprecated="32" />
-		<field name="REPORT_KEY_NUM_TOTAL" deprecated="32" />
-		<field name="REPORT_KEY_STACK" deprecated="32" />
-		<field name="REPORT_VALUE_ID" deprecated="32" />
-		<field name="REPORT_VALUE_RESULT_ERROR" deprecated="32" />
-		<field name="REPORT_VALUE_RESULT_FAILURE" deprecated="32" />
-		<field name="REPORT_VALUE_RESULT_OK" deprecated="32" />
-		<field name="REPORT_VALUE_RESULT_START" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="addTestListener(Ljunit/framework/TestListener;)V" since="33" deprecated="33" />
+		<method name="getAllTests()Ljunit/framework/TestSuite;" deprecated="33" />
+		<method name="getAndroidTestRunner()Landroid/test/AndroidTestRunner;" deprecated="33" />
+		<method name="getArguments()Landroid/os/Bundle;" since="18" deprecated="33" />
+		<method name="getLoader()Ljava/lang/ClassLoader;" deprecated="33" />
+		<field name="REPORT_KEY_NAME_CLASS" deprecated="33" />
+		<field name="REPORT_KEY_NAME_TEST" deprecated="33" />
+		<field name="REPORT_KEY_NUM_CURRENT" deprecated="33" />
+		<field name="REPORT_KEY_NUM_TOTAL" deprecated="33" />
+		<field name="REPORT_KEY_STACK" deprecated="33" />
+		<field name="REPORT_VALUE_ID" deprecated="33" />
+		<field name="REPORT_VALUE_RESULT_ERROR" deprecated="33" />
+		<field name="REPORT_VALUE_RESULT_FAILURE" deprecated="33" />
+		<field name="REPORT_VALUE_RESULT_OK" deprecated="33" />
+		<field name="REPORT_VALUE_RESULT_START" deprecated="33" />
 	</class>
 	<class name="android/test/InstrumentationTestSuite" since="1" deprecated="24">
 		<extends name="junit/framework/TestSuite" />
-		<method name="&lt;init&gt;(Landroid/app/Instrumentation;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;Landroid/app/Instrumentation;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Landroid/app/Instrumentation;)V" deprecated="32" />
+		<method name="&lt;init&gt;(Landroid/app/Instrumentation;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;Landroid/app/Instrumentation;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Landroid/app/Instrumentation;)V" deprecated="33" />
 	</class>
 	<class name="android/test/IsolatedContext" since="1" deprecated="24">
 		<extends name="android/content/ContextWrapper" />
-		<method name="&lt;init&gt;(Landroid/content/ContentResolver;Landroid/content/Context;)V" deprecated="32" />
-		<method name="getAndClearBroadcastIntents()Ljava/util/List;" deprecated="32" />
+		<method name="&lt;init&gt;(Landroid/content/ContentResolver;Landroid/content/Context;)V" deprecated="33" />
+		<method name="getAndClearBroadcastIntents()Ljava/util/List;" deprecated="33" />
 	</class>
-	<class name="android/test/LaunchPerformanceBase" since="32" deprecated="32">
+	<class name="android/test/LaunchPerformanceBase" since="33" deprecated="33">
 		<extends name="android/app/Instrumentation" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="LaunchApp()V" deprecated="32" />
-		<field name="mIntent" deprecated="32" />
-		<field name="mResults" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="LaunchApp()V" deprecated="33" />
+		<field name="mIntent" deprecated="33" />
+		<field name="mResults" deprecated="33" />
 	</class>
 	<class name="android/test/LoaderTestCase" since="11">
 		<extends name="android/test/AndroidTestCase" />
@@ -44480,63 +44555,63 @@
 	</class>
 	<class name="android/test/MoreAsserts" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
-		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Class;)V" deprecated="32" />
-		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32" />
-		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32" />
-		<method name="assertContentsInAnyOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertContentsInAnyOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertContentsInOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertContentsInOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertEmpty(Ljava/lang/Iterable;)V" deprecated="32" />
-		<method name="assertEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="32" />
-		<method name="assertEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="32" />
-		<method name="assertEmpty(Ljava/util/Map;)V" deprecated="32" />
-		<method name="assertEquals(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V" deprecated="32" />
-		<method name="assertEquals(Ljava/lang/String;[B[B)V" deprecated="32" />
-		<method name="assertEquals(Ljava/lang/String;[D[D)V" deprecated="32" />
-		<method name="assertEquals(Ljava/lang/String;[I[I)V" deprecated="32" />
-		<method name="assertEquals(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertEquals(Ljava/util/Set;Ljava/util/Set;)V" deprecated="32" />
-		<method name="assertEquals([B[B)V" deprecated="32" />
-		<method name="assertEquals([D[D)V" deprecated="32" />
-		<method name="assertEquals([I[I)V" deprecated="32" />
-		<method name="assertEquals([Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32" />
-		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32" />
-		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
-		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
-		<method name="assertNotEmpty(Ljava/lang/Iterable;)V" deprecated="32" />
-		<method name="assertNotEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="32" />
-		<method name="assertNotEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="32" />
-		<method name="assertNotEmpty(Ljava/util/Map;)V" deprecated="32" />
-		<method name="assertNotEqual(Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertNotEqual(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="32" />
-		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
-		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
-		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="32" />
-		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="32" />
+		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Class;)V" deprecated="33" />
+		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33" />
+		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33" />
+		<method name="assertContentsInAnyOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertContentsInAnyOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertContentsInOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertContentsInOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertEmpty(Ljava/lang/Iterable;)V" deprecated="33" />
+		<method name="assertEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="33" />
+		<method name="assertEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="33" />
+		<method name="assertEmpty(Ljava/util/Map;)V" deprecated="33" />
+		<method name="assertEquals(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V" deprecated="33" />
+		<method name="assertEquals(Ljava/lang/String;[B[B)V" deprecated="33" />
+		<method name="assertEquals(Ljava/lang/String;[D[D)V" deprecated="33" />
+		<method name="assertEquals(Ljava/lang/String;[I[I)V" deprecated="33" />
+		<method name="assertEquals(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertEquals(Ljava/util/Set;Ljava/util/Set;)V" deprecated="33" />
+		<method name="assertEquals([B[B)V" deprecated="33" />
+		<method name="assertEquals([D[D)V" deprecated="33" />
+		<method name="assertEquals([I[I)V" deprecated="33" />
+		<method name="assertEquals([Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33" />
+		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33" />
+		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
+		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
+		<method name="assertNotEmpty(Ljava/lang/Iterable;)V" deprecated="33" />
+		<method name="assertNotEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="33" />
+		<method name="assertNotEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="33" />
+		<method name="assertNotEmpty(Ljava/util/Map;)V" deprecated="33" />
+		<method name="assertNotEqual(Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertNotEqual(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="33" />
+		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
+		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
+		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="33" />
+		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="33" />
 	</class>
 	<class name="android/test/PerformanceTestCase" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
-		<method name="isPerformanceOnly()Z" deprecated="32" />
-		<method name="startPerformance(Landroid/test/PerformanceTestCase$Intermediates;)I" deprecated="32" />
+		<method name="isPerformanceOnly()Z" deprecated="33" />
+		<method name="startPerformance(Landroid/test/PerformanceTestCase$Intermediates;)I" deprecated="33" />
 	</class>
-	<class name="android/test/PerformanceTestCase$Intermediates" since="1" deprecated="32">
+	<class name="android/test/PerformanceTestCase$Intermediates" since="1" deprecated="33">
 		<extends name="java/lang/Object" />
-		<method name="addIntermediate(Ljava/lang/String;)V" deprecated="32" />
-		<method name="addIntermediate(Ljava/lang/String;J)V" deprecated="32" />
-		<method name="finishTiming(Z)V" deprecated="32" />
-		<method name="setInternalIterations(I)V" deprecated="32" />
-		<method name="startTiming(Z)V" deprecated="32" />
+		<method name="addIntermediate(Ljava/lang/String;)V" deprecated="33" />
+		<method name="addIntermediate(Ljava/lang/String;J)V" deprecated="33" />
+		<method name="finishTiming(Z)V" deprecated="33" />
+		<method name="setInternalIterations(I)V" deprecated="33" />
+		<method name="startTiming(Z)V" deprecated="33" />
 	</class>
 	<class name="android/test/ProviderTestCase" since="1" deprecated="5">
 		<extends name="android/test/InstrumentationTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;Ljava/lang/String;)V" deprecated="32" />
-		<method name="getMockContentResolver()Landroid/test/mock/MockContentResolver;" deprecated="32" />
-		<method name="getMockContext()Landroid/test/IsolatedContext;" deprecated="32" />
-		<method name="getProvider()Landroid/content/ContentProvider;" deprecated="32" />
-		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;Ljava/lang/String;)V" deprecated="33" />
+		<method name="getMockContentResolver()Landroid/test/mock/MockContentResolver;" deprecated="33" />
+		<method name="getMockContext()Landroid/test/IsolatedContext;" deprecated="33" />
+		<method name="getProvider()Landroid/content/ContentProvider;" deprecated="33" />
+		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" deprecated="33" />
 	</class>
 	<class name="android/test/ProviderTestCase2" since="3">
 		<extends name="android/test/AndroidTestCase" />
@@ -44548,81 +44623,81 @@
 	</class>
 	<class name="android/test/RenamingDelegatingContext" since="1" deprecated="24">
 		<extends name="android/content/ContextWrapper" />
-		<method name="&lt;init&gt;(Landroid/content/Context;Landroid/content/Context;Ljava/lang/String;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Landroid/content/Context;Ljava/lang/String;)V" deprecated="32" />
-		<method name="getDatabasePrefix()Ljava/lang/String;" deprecated="32" />
-		<method name="makeExistingFilesAndDbsAccessible()V" deprecated="32" />
-		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;)Landroid/content/ContentProvider;" deprecated="32" />
-		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)Landroid/content/ContentProvider;" deprecated="32" />
+		<method name="&lt;init&gt;(Landroid/content/Context;Landroid/content/Context;Ljava/lang/String;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Landroid/content/Context;Ljava/lang/String;)V" deprecated="33" />
+		<method name="getDatabasePrefix()Ljava/lang/String;" deprecated="33" />
+		<method name="makeExistingFilesAndDbsAccessible()V" deprecated="33" />
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;)Landroid/content/ContentProvider;" deprecated="33" />
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)Landroid/content/ContentProvider;" deprecated="33" />
 	</class>
-	<class name="android/test/RepetitiveTest" since="32" deprecated="32">
+	<class name="android/test/RepetitiveTest" since="33" deprecated="33">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
-		<method name="numIterations()I" deprecated="32" />
+		<method name="numIterations()I" deprecated="33" />
 	</class>
 	<class name="android/test/ServiceTestCase" since="1" deprecated="24">
 		<extends name="android/test/AndroidTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="bindService(Landroid/content/Intent;)Landroid/os/IBinder;" deprecated="32" />
-		<method name="getApplication()Landroid/app/Application;" deprecated="32" />
-		<method name="getService()Landroid/app/Service;" deprecated="32" />
-		<method name="getSystemContext()Landroid/content/Context;" deprecated="32" />
-		<method name="setApplication(Landroid/app/Application;)V" deprecated="32" />
-		<method name="setupService()V" deprecated="32" />
-		<method name="shutdownService()V" deprecated="32" />
-		<method name="startService(Landroid/content/Intent;)V" deprecated="32" />
-		<method name="testServiceTestCaseSetUpProperly()V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="bindService(Landroid/content/Intent;)Landroid/os/IBinder;" deprecated="33" />
+		<method name="getApplication()Landroid/app/Application;" deprecated="33" />
+		<method name="getService()Landroid/app/Service;" deprecated="33" />
+		<method name="getSystemContext()Landroid/content/Context;" deprecated="33" />
+		<method name="setApplication(Landroid/app/Application;)V" deprecated="33" />
+		<method name="setupService()V" deprecated="33" />
+		<method name="shutdownService()V" deprecated="33" />
+		<method name="startService(Landroid/content/Intent;)V" deprecated="33" />
+		<method name="testServiceTestCaseSetUpProperly()V" deprecated="33" />
 	</class>
 	<class name="android/test/SingleLaunchActivityTestCase" since="1" deprecated="24">
 		<extends name="android/test/InstrumentationTestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="32" />
-		<method name="getActivity()Landroid/app/Activity;" deprecated="32" />
-		<method name="testActivityTestCaseSetUpProperly()V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="33" />
+		<method name="getActivity()Landroid/app/Activity;" deprecated="33" />
+		<method name="testActivityTestCaseSetUpProperly()V" deprecated="33" />
 	</class>
 	<class name="android/test/SyncBaseInstrumentation" since="1" deprecated="24">
 		<extends name="android/test/InstrumentationTestCase" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="cancelSyncsandDisableAutoSync()V" deprecated="32" />
-		<method name="syncProvider(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="cancelSyncsandDisableAutoSync()V" deprecated="33" />
+		<method name="syncProvider(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33" />
 	</class>
 	<class name="android/test/TestSuiteProvider" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
-		<method name="getTestSuite()Ljunit/framework/TestSuite;" deprecated="32" />
+		<method name="getTestSuite()Ljunit/framework/TestSuite;" deprecated="33" />
 	</class>
 	<class name="android/test/TouchUtils" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="clickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="clickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="33" />
 		<method name="drag(Landroid/test/ActivityInstrumentationTestCase;FFFFI)V" deprecated="15" />
-		<method name="drag(Landroid/test/InstrumentationTestCase;FFFFI)V" since="3" deprecated="32" />
+		<method name="drag(Landroid/test/InstrumentationTestCase;FFFFI)V" since="3" deprecated="33" />
 		<method name="dragQuarterScreenDown(Landroid/test/ActivityInstrumentationTestCase;)V" deprecated="15" />
-		<method name="dragQuarterScreenDown(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="32" />
+		<method name="dragQuarterScreenDown(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="33" />
 		<method name="dragQuarterScreenUp(Landroid/test/ActivityInstrumentationTestCase;)V" deprecated="15" />
-		<method name="dragQuarterScreenUp(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="32" />
+		<method name="dragQuarterScreenUp(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="33" />
 		<method name="dragViewBy(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;III)I" deprecated="15" />
 		<method name="dragViewBy(Landroid/test/InstrumentationTestCase;Landroid/view/View;III)I" since="3" deprecated="15" />
 		<method name="dragViewTo(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;III)I" deprecated="15" />
-		<method name="dragViewTo(Landroid/test/InstrumentationTestCase;Landroid/view/View;III)I" since="3" deprecated="32" />
+		<method name="dragViewTo(Landroid/test/InstrumentationTestCase;Landroid/view/View;III)I" since="3" deprecated="33" />
 		<method name="dragViewToBottom(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;)V" deprecated="15" />
 		<method name="dragViewToBottom(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;I)V" deprecated="15" />
-		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;)V" since="3" deprecated="32" />
-		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;I)V" since="3" deprecated="32" />
+		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;)V" since="3" deprecated="33" />
+		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;I)V" since="3" deprecated="33" />
 		<method name="dragViewToTop(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;)V" deprecated="15" />
 		<method name="dragViewToTop(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;I)V" deprecated="15" />
-		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="32" />
-		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;I)V" since="3" deprecated="32" />
+		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="33" />
+		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;I)V" since="3" deprecated="33" />
 		<method name="dragViewToX(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;II)I" deprecated="15" />
-		<method name="dragViewToX(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="32" />
+		<method name="dragViewToX(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="33" />
 		<method name="dragViewToY(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;II)I" deprecated="15" />
-		<method name="dragViewToY(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="32" />
+		<method name="dragViewToY(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="33" />
 		<method name="longClickView(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;)V" deprecated="15" />
-		<method name="longClickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="32" />
+		<method name="longClickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="33" />
 		<method name="scrollToBottom(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/ViewGroup;)V" deprecated="15" />
-		<method name="scrollToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="32" />
+		<method name="scrollToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="33" />
 		<method name="scrollToTop(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/ViewGroup;)V" deprecated="15" />
-		<method name="scrollToTop(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="32" />
-		<method name="tapView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="32" />
-		<method name="touchAndCancelView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="32" />
+		<method name="scrollToTop(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="33" />
+		<method name="tapView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="33" />
+		<method name="touchAndCancelView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="33" />
 	</class>
 	<class name="android/test/UiThreadTest" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
@@ -44630,39 +44705,39 @@
 	</class>
 	<class name="android/test/ViewAsserts" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
-		<method name="assertBaselineAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32" />
-		<method name="assertGroupContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertGroupIntegrity(Landroid/view/ViewGroup;)V" deprecated="32" />
-		<method name="assertGroupNotContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertHasScreenCoordinates(Landroid/view/View;Landroid/view/View;II)V" deprecated="32" />
-		<method name="assertHorizontalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32" />
-		<method name="assertOffScreenAbove(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertOffScreenBelow(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertOnScreen(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32" />
-		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
-		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32" />
-		<method name="assertVerticalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32" />
+		<method name="assertBaselineAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33" />
+		<method name="assertGroupContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertGroupIntegrity(Landroid/view/ViewGroup;)V" deprecated="33" />
+		<method name="assertGroupNotContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertHasScreenCoordinates(Landroid/view/View;Landroid/view/View;II)V" deprecated="33" />
+		<method name="assertHorizontalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33" />
+		<method name="assertOffScreenAbove(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertOffScreenBelow(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertOnScreen(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33" />
+		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
+		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33" />
+		<method name="assertVerticalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33" />
 	</class>
-	<class name="android/test/mock/MockAccountManager" since="32" deprecated="32">
+	<class name="android/test/mock/MockAccountManager" since="33" deprecated="33">
 		<extends name="java/lang/Object" />
-		<method name="newMockAccountManager(Landroid/content/Context;)Landroid/accounts/AccountManager;" deprecated="32" />
+		<method name="newMockAccountManager(Landroid/content/Context;)Landroid/accounts/AccountManager;" deprecated="33" />
 	</class>
 	<class name="android/test/mock/MockApplication" since="1" deprecated="24">
 		<extends name="android/app/Application" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
 	</class>
 	<class name="android/test/mock/MockContentProvider" since="8">
 		<extends name="android/content/ContentProvider" />
 		<method name="&lt;init&gt;()V" />
 		<method name="&lt;init&gt;(Landroid/content/Context;)V" />
 		<method name="&lt;init&gt;(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Landroid/content/pm/PathPermission;)V" />
-		<method name="attachInfoForTesting(Landroid/content/ContentProvider;Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V" since="32" deprecated="32" />
+		<method name="attachInfoForTesting(Landroid/content/ContentProvider;Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V" since="33" deprecated="33" />
 	</class>
 	<class name="android/test/mock/MockContentResolver" since="1">
 		<extends name="android/content/ContentResolver" />
@@ -44679,7 +44754,7 @@
 	<class name="android/test/mock/MockCursor" since="8" deprecated="24">
 		<extends name="java/lang/Object" />
 		<implements name="android/database/Cursor" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
 		<method name="abortUpdates()V" removed="11" />
 		<method name="commitUpdates()Z" removed="11" />
 		<method name="commitUpdates(Ljava/util/Map;)Z" removed="11" />
@@ -44698,58 +44773,58 @@
 	<class name="android/test/mock/MockDialogInterface" since="1" deprecated="24">
 		<extends name="java/lang/Object" />
 		<implements name="android/content/DialogInterface" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
 	</class>
 	<class name="android/test/mock/MockPackageManager" since="1" deprecated="24">
 		<extends name="android/content/pm/PackageManager" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
-		<method name="getAllIntentFilters(Ljava/lang/String;)Ljava/util/List;" since="23" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
+		<method name="getAllIntentFilters(Ljava/lang/String;)Ljava/util/List;" since="23" deprecated="33" />
 		<method name="getDefaultBrowserPackageName(I)Ljava/lang/String;" since="23" removed="24" />
-		<method name="resolveServiceAsUser(Landroid/content/Intent;II)Landroid/content/pm/ResolveInfo;" since="32" deprecated="32" />
+		<method name="resolveServiceAsUser(Landroid/content/Intent;II)Landroid/content/pm/ResolveInfo;" since="33" deprecated="33" />
 		<method name="setDefaultBrowserPackageName(Ljava/lang/String;I)Z" since="23" removed="24" />
 		<method name="setPackageObbPath(Ljava/lang/String;Ljava/lang/String;)V" since="9" removed="10" />
 	</class>
 	<class name="android/test/mock/MockResources" since="1" deprecated="24">
 		<extends name="android/content/res/Resources" />
-		<method name="&lt;init&gt;()V" deprecated="32" />
+		<method name="&lt;init&gt;()V" deprecated="33" />
 	</class>
-	<class name="android/test/mock/MockService" since="32" deprecated="32">
+	<class name="android/test/mock/MockService" since="33" deprecated="33">
 		<extends name="java/lang/Object" />
-		<method name="attachForTesting(Landroid/app/Service;Landroid/content/Context;Ljava/lang/String;Landroid/app/Application;)V" deprecated="32" />
+		<method name="attachForTesting(Landroid/app/Service;Landroid/content/Context;Ljava/lang/String;Landroid/app/Application;)V" deprecated="33" />
 	</class>
 	<class name="android/test/suitebuilder/TestMethod" since="1" deprecated="26">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" since="3" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/reflect/Method;Ljava/lang/Class;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljunit/framework/TestCase;)V" since="3" deprecated="32" />
-		<method name="createTest()Ljunit/framework/TestCase;" deprecated="32" />
-		<method name="getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;" deprecated="32" />
-		<method name="getEnclosingClass()Ljava/lang/Class;" deprecated="32" />
-		<method name="getEnclosingClassname()Ljava/lang/String;" deprecated="32" />
-		<method name="getName()Ljava/lang/String;" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/Class;)V" since="3" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/reflect/Method;Ljava/lang/Class;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljunit/framework/TestCase;)V" since="3" deprecated="33" />
+		<method name="createTest()Ljunit/framework/TestCase;" deprecated="33" />
+		<method name="getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;" deprecated="33" />
+		<method name="getEnclosingClass()Ljava/lang/Class;" deprecated="33" />
+		<method name="getEnclosingClassname()Ljava/lang/String;" deprecated="33" />
+		<method name="getName()Ljava/lang/String;" deprecated="33" />
 	</class>
 	<class name="android/test/suitebuilder/TestSuiteBuilder" since="1" deprecated="26">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="33" />
 		<method name="addRequirements(Ljava/util/List;)Landroid/test/suitebuilder/TestSuiteBuilder;" removed="28" />
 		<method name="addRequirements([Lcom/android/internal/util/Predicate;)Landroid/test/suitebuilder/TestSuiteBuilder;" removed="28" />
-		<method name="build()Ljunit/framework/TestSuite;" deprecated="32" />
-		<method name="excludePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32" />
-		<method name="getSuiteName()Ljava/lang/String;" deprecated="32" />
-		<method name="includeAllPackagesUnderHere()Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32" />
-		<method name="includePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32" />
-		<method name="named(Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32" />
+		<method name="build()Ljunit/framework/TestSuite;" deprecated="33" />
+		<method name="excludePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33" />
+		<method name="getSuiteName()Ljava/lang/String;" deprecated="33" />
+		<method name="includeAllPackagesUnderHere()Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33" />
+		<method name="includePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33" />
+		<method name="named(Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33" />
 	</class>
 	<class name="android/test/suitebuilder/TestSuiteBuilder$FailedToCreateTests" since="1" deprecated="26">
 		<extends name="junit/framework/TestCase" />
-		<method name="&lt;init&gt;(Ljava/lang/Exception;)V" deprecated="32" />
-		<method name="testSuiteConstructionFailed()V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Exception;)V" deprecated="33" />
+		<method name="testSuiteConstructionFailed()V" deprecated="33" />
 	</class>
-	<class name="android/test/suitebuilder/UnitTestSuiteBuilder" since="32" deprecated="32">
+	<class name="android/test/suitebuilder/UnitTestSuiteBuilder" since="33" deprecated="33">
 		<extends name="android/test/suitebuilder/TestSuiteBuilder" />
-		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="32" />
-		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="32" />
+		<method name="&lt;init&gt;(Ljava/lang/Class;)V" deprecated="33" />
+		<method name="&lt;init&gt;(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="33" />
 	</class>
 	<class name="android/test/suitebuilder/annotation/LargeTest" since="2" deprecated="24">
 		<extends name="java/lang/Object" />
@@ -47568,8 +47643,14 @@
 	</class>
 	<class name="android/view/AttachedSurfaceControl" since="31">
 		<extends name="java/lang/Object" />
+		<method name="addOnBufferTransformHintChangedListener(Landroid/view/AttachedSurfaceControl$OnBufferTransformHintChangedListener;)V" since="33" />
 		<method name="applyTransactionOnDraw(Landroid/view/SurfaceControl$Transaction;)Z" />
 		<method name="buildReparentTransaction(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;" />
+		<method name="getBufferTransformHint()I" since="33" />
+		<method name="removeOnBufferTransformHintChangedListener(Landroid/view/AttachedSurfaceControl$OnBufferTransformHintChangedListener;)V" since="33" />
+	</class>
+	<class name="android/view/AttachedSurfaceControl$OnBufferTransformHintChangedListener" since="33">
+		<method name="onBufferTransformHintChanged(I)V" />
 	</class>
 	<class name="android/view/Choreographer" since="16">
 		<extends name="java/lang/Object" />
@@ -49069,6 +49150,12 @@
 		<method name="isValid()Z" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
 		<method name="release()V" />
+		<field name="BUFFER_TRANSFORM_IDENTITY" since="33" />
+		<field name="BUFFER_TRANSFORM_MIRROR_HORIZONTAL" since="33" />
+		<field name="BUFFER_TRANSFORM_MIRROR_VERTICAL" since="33" />
+		<field name="BUFFER_TRANSFORM_ROTATE_180" since="33" />
+		<field name="BUFFER_TRANSFORM_ROTATE_270" since="33" />
+		<field name="BUFFER_TRANSFORM_ROTATE_90" since="33" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/SurfaceControl$Builder" since="29">
@@ -49924,6 +50011,7 @@
 		<field name="AUTOFILL_TYPE_NONE" since="26" />
 		<field name="AUTOFILL_TYPE_TEXT" since="26" />
 		<field name="AUTOFILL_TYPE_TOGGLE" since="26" />
+		<field name="DRAG_FLAG_ACCESSIBILITY_ACTION" since="33" />
 		<field name="DRAG_FLAG_GLOBAL" since="24" />
 		<field name="DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION" since="24" />
 		<field name="DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION" since="24" />
@@ -51355,6 +51443,9 @@
 		<method name="setPassword(Z)V" removed="14" />
 		<method name="setRemovedCount(I)V" removed="14" />
 		<field name="CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION" since="19" />
+		<field name="CONTENT_CHANGE_TYPE_DRAG_CANCELLED" since="33" />
+		<field name="CONTENT_CHANGE_TYPE_DRAG_DROPPED" since="33" />
+		<field name="CONTENT_CHANGE_TYPE_DRAG_STARTED" since="33" />
 		<field name="CONTENT_CHANGE_TYPE_PANE_APPEARED" since="28" />
 		<field name="CONTENT_CHANGE_TYPE_PANE_DISAPPEARED" since="28" />
 		<field name="CONTENT_CHANGE_TYPE_PANE_TITLE" since="28" />
@@ -51651,6 +51742,9 @@
 		<field name="ACTION_COPY" />
 		<field name="ACTION_CUT" />
 		<field name="ACTION_DISMISS" />
+		<field name="ACTION_DRAG_CANCEL" since="33" />
+		<field name="ACTION_DRAG_DROP" since="33" />
+		<field name="ACTION_DRAG_START" since="33" />
 		<field name="ACTION_EXPAND" />
 		<field name="ACTION_FOCUS" />
 		<field name="ACTION_HIDE_TOOLTIP" since="28" />
diff --git a/current/public/data/api-versions.xml b/current/public/data/api-versions.xml
index 99dbd6e..04d49f8 100644
--- a/current/public/data/api-versions.xml
+++ b/current/public/data/api-versions.xml
@@ -115,6 +115,7 @@
 		<field name="INTERNAL_SYSTEM_WINDOW" removed="23"/>
 		<field name="INTERNET"/>
 		<field name="KILL_BACKGROUND_PROCESSES" since="8"/>
+		<field name="LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" since="33"/>
 		<field name="LOADER_USAGE_STATS" since="30"/>
 		<field name="LOCATION_HARDWARE" since="18"/>
 		<field name="MANAGE_ACCOUNTS" since="5" removed="23"/>
@@ -1360,6 +1361,7 @@
 		<field name="shortcutLongLabel" since="25"/>
 		<field name="shortcutShortLabel" since="25"/>
 		<field name="shouldDisableView"/>
+		<field name="shouldUseDefaultUnfoldTransition" since="33"/>
 		<field name="showAsAction" since="11"/>
 		<field name="showDefault"/>
 		<field name="showDividers" since="11"/>
@@ -2075,6 +2077,9 @@
 		<extends name="java/lang/Object"/>
 		<method name="&lt;init>()V"/>
 		<field name="accessibilityActionContextClick" since="23"/>
+		<field name="accessibilityActionDragCancel" since="33"/>
+		<field name="accessibilityActionDragDrop" since="33"/>
+		<field name="accessibilityActionDragStart" since="33"/>
 		<field name="accessibilityActionHideTooltip" since="28"/>
 		<field name="accessibilityActionImeEnter" since="30"/>
 		<field name="accessibilityActionMoveWindow" since="26"/>
@@ -6656,6 +6661,7 @@
 	</class>
 	<class name="android/app/TaskInfo" since="29">
 		<extends name="java/lang/Object"/>
+		<method name="isVisible()Z" since="33"/>
 		<field name="baseActivity"/>
 		<field name="baseIntent"/>
 		<field name="isRunning"/>
@@ -6868,6 +6874,7 @@
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;"/>
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;"/>
 		<method name="loadThumbnail(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;"/>
+		<method name="shouldUseDefaultUnfoldTransition()Z" since="33"/>
 		<method name="supportsMultipleDisplays()Z" since="29"/>
 		<field name="CREATOR"/>
 	</class>
@@ -17994,6 +18001,7 @@
 		<field name="EDGE_AVAILABLE_EDGE_MODES"/>
 		<field name="FLASH_INFO_AVAILABLE"/>
 		<field name="HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES"/>
+		<field name="INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP" since="33"/>
 		<field name="INFO_SUPPORTED_HARDWARE_LEVEL"/>
 		<field name="INFO_VERSION" since="28"/>
 		<field name="JPEG_AVAILABLE_THUMBNAIL_SIZES"/>
@@ -18679,6 +18687,12 @@
 		<method name="copyElements([Landroid/util/Rational;I)V"/>
 		<method name="getElement(II)Landroid/util/Rational;"/>
 	</class>
+	<class name="android/hardware/camera2/params/DeviceStateSensorOrientationMap" since="33">
+		<extends name="java/lang/Object"/>
+		<method name="getSensorOrientation(J)I"/>
+		<field name="FOLDED"/>
+		<field name="NORMAL"/>
+	</class>
 	<class name="android/hardware/camera2/params/ExtensionSessionConfiguration" since="31">
 		<extends name="java/lang/Object"/>
 		<method name="&lt;init>(ILjava/util/List;Ljava/util/concurrent/Executor;Landroid/hardware/camera2/CameraExtensionSession$StateCallback;)V"/>
@@ -25097,8 +25111,10 @@
 		<method name="getAllowedCapturePolicy()I" since="29"/>
 		<method name="getContentType()I"/>
 		<method name="getFlags()I"/>
+		<method name="getSpatializationBehavior()I" since="33"/>
 		<method name="getUsage()I"/>
 		<method name="getVolumeControlStream()I" since="26"/>
+		<method name="isContentSpatialized()Z" since="33"/>
 		<field name="ALLOW_CAPTURE_BY_ALL" since="29"/>
 		<field name="ALLOW_CAPTURE_BY_NONE" since="29"/>
 		<field name="ALLOW_CAPTURE_BY_SYSTEM" since="29"/>
@@ -25111,6 +25127,8 @@
 		<field name="FLAG_AUDIBILITY_ENFORCED"/>
 		<field name="FLAG_HW_AV_SYNC"/>
 		<field name="FLAG_LOW_LATENCY" since="24" deprecated="26"/>
+		<field name="SPATIALIZATION_BEHAVIOR_AUTO" since="33"/>
+		<field name="SPATIALIZATION_BEHAVIOR_NEVER" since="33"/>
 		<field name="USAGE_ALARM"/>
 		<field name="USAGE_ASSISTANCE_ACCESSIBILITY"/>
 		<field name="USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>
@@ -25137,7 +25155,9 @@
 		<method name="setContentType(I)Landroid/media/AudioAttributes$Builder;"/>
 		<method name="setFlags(I)Landroid/media/AudioAttributes$Builder;"/>
 		<method name="setHapticChannelsMuted(Z)Landroid/media/AudioAttributes$Builder;" since="29"/>
+		<method name="setIsContentSpatialized(Z)Landroid/media/AudioAttributes$Builder;" since="33"/>
 		<method name="setLegacyStreamType(I)Landroid/media/AudioAttributes$Builder;"/>
+		<method name="setSpatializationBehavior(I)Landroid/media/AudioAttributes$Builder;" since="33"/>
 		<method name="setUsage(I)Landroid/media/AudioAttributes$Builder;"/>
 	</class>
 	<class name="android/media/AudioDescriptor" since="31">
@@ -25254,24 +25274,45 @@
 		<field name="CHANNEL_IN_Y_AXIS" since="5"/>
 		<field name="CHANNEL_IN_Z_AXIS" since="5"/>
 		<field name="CHANNEL_OUT_5POINT1" since="5"/>
+		<field name="CHANNEL_OUT_5POINT1POINT2" since="33"/>
+		<field name="CHANNEL_OUT_5POINT1POINT4" since="33"/>
 		<field name="CHANNEL_OUT_7POINT1" since="5" deprecated="23"/>
+		<field name="CHANNEL_OUT_7POINT1POINT2" since="33"/>
+		<field name="CHANNEL_OUT_7POINT1POINT4" since="33"/>
 		<field name="CHANNEL_OUT_7POINT1_SURROUND" since="23"/>
+		<field name="CHANNEL_OUT_9POINT1POINT4" since="33"/>
+		<field name="CHANNEL_OUT_9POINT1POINT6" since="33"/>
 		<field name="CHANNEL_OUT_BACK_CENTER" since="5"/>
 		<field name="CHANNEL_OUT_BACK_LEFT" since="5"/>
 		<field name="CHANNEL_OUT_BACK_RIGHT" since="5"/>
+		<field name="CHANNEL_OUT_BOTTOM_FRONT_CENTER" since="33"/>
+		<field name="CHANNEL_OUT_BOTTOM_FRONT_LEFT" since="33"/>
+		<field name="CHANNEL_OUT_BOTTOM_FRONT_RIGHT" since="33"/>
 		<field name="CHANNEL_OUT_DEFAULT" since="5"/>
 		<field name="CHANNEL_OUT_FRONT_CENTER" since="5"/>
 		<field name="CHANNEL_OUT_FRONT_LEFT" since="5"/>
 		<field name="CHANNEL_OUT_FRONT_LEFT_OF_CENTER" since="5"/>
 		<field name="CHANNEL_OUT_FRONT_RIGHT" since="5"/>
 		<field name="CHANNEL_OUT_FRONT_RIGHT_OF_CENTER" since="5"/>
+		<field name="CHANNEL_OUT_FRONT_WIDE_LEFT" since="33"/>
+		<field name="CHANNEL_OUT_FRONT_WIDE_RIGHT" since="33"/>
 		<field name="CHANNEL_OUT_LOW_FREQUENCY" since="5"/>
+		<field name="CHANNEL_OUT_LOW_FREQUENCY_2" since="33"/>
 		<field name="CHANNEL_OUT_MONO" since="5"/>
 		<field name="CHANNEL_OUT_QUAD" since="5"/>
 		<field name="CHANNEL_OUT_SIDE_LEFT" since="21"/>
 		<field name="CHANNEL_OUT_SIDE_RIGHT" since="21"/>
 		<field name="CHANNEL_OUT_STEREO" since="5"/>
 		<field name="CHANNEL_OUT_SURROUND" since="5"/>
+		<field name="CHANNEL_OUT_TOP_BACK_CENTER" since="33"/>
+		<field name="CHANNEL_OUT_TOP_BACK_LEFT" since="33"/>
+		<field name="CHANNEL_OUT_TOP_BACK_RIGHT" since="33"/>
+		<field name="CHANNEL_OUT_TOP_CENTER" since="33"/>
+		<field name="CHANNEL_OUT_TOP_FRONT_CENTER" since="33"/>
+		<field name="CHANNEL_OUT_TOP_FRONT_LEFT" since="33"/>
+		<field name="CHANNEL_OUT_TOP_FRONT_RIGHT" since="33"/>
+		<field name="CHANNEL_OUT_TOP_SIDE_LEFT" since="33"/>
+		<field name="CHANNEL_OUT_TOP_SIDE_RIGHT" since="33"/>
 		<field name="CREATOR" since="24"/>
 		<field name="ENCODING_AAC_ELD" since="28"/>
 		<field name="ENCODING_AAC_HE_V1" since="28"/>
@@ -25341,6 +25382,7 @@
 		<method name="getProperty(Ljava/lang/String;)Ljava/lang/String;" since="17"/>
 		<method name="getRingerMode()I"/>
 		<method name="getRouting(I)I" deprecated="15"/>
+		<method name="getSpatializer()Landroid/media/Spatializer;" since="33"/>
 		<method name="getStreamMaxVolume(I)I"/>
 		<method name="getStreamMinVolume(I)I" since="28"/>
 		<method name="getStreamVolume(I)I"/>
@@ -27484,6 +27526,7 @@
 		<field name="KEY_MAX_FPS_TO_ENCODER" since="29"/>
 		<field name="KEY_MAX_HEIGHT" since="19"/>
 		<field name="KEY_MAX_INPUT_SIZE"/>
+		<field name="KEY_MAX_OUTPUT_CHANNEL_COUNT" since="33"/>
 		<field name="KEY_MAX_PTS_GAP_TO_ENCODER" since="29"/>
 		<field name="KEY_MAX_WIDTH" since="19"/>
 		<field name="KEY_MIME"/>
@@ -28928,6 +28971,22 @@
 		<extends name="java/lang/Object"/>
 		<method name="onLoadComplete(Landroid/media/SoundPool;II)V"/>
 	</class>
+	<class name="android/media/Spatializer" since="33">
+		<extends name="java/lang/Object"/>
+		<method name="addOnSpatializerStateChangedListener(Ljava/util/concurrent/Executor;Landroid/media/Spatializer$OnSpatializerStateChangedListener;)V"/>
+		<method name="canBeSpatialized(Landroid/media/AudioAttributes;Landroid/media/AudioFormat;)Z"/>
+		<method name="getImmersiveAudioLevel()I"/>
+		<method name="isAvailable()Z"/>
+		<method name="isEnabled()Z"/>
+		<method name="removeOnSpatializerStateChangedListener(Landroid/media/Spatializer$OnSpatializerStateChangedListener;)V"/>
+		<field name="SPATIALIZER_IMMERSIVE_LEVEL_MULTICHANNEL"/>
+		<field name="SPATIALIZER_IMMERSIVE_LEVEL_NONE"/>
+		<field name="SPATIALIZER_IMMERSIVE_LEVEL_OTHER"/>
+	</class>
+	<class name="android/media/Spatializer$OnSpatializerStateChangedListener" since="33">
+		<method name="onSpatializerAvailableChanged(Landroid/media/Spatializer;Z)V"/>
+		<method name="onSpatializerEnabledChanged(Landroid/media/Spatializer;Z)V"/>
+	</class>
 	<class name="android/media/SubtitleData" since="28">
 		<extends name="java/lang/Object"/>
 		<method name="&lt;init>(IJJ[B)V" since="29"/>
@@ -37986,6 +38045,7 @@
 		<field name="Q" since="29"/>
 		<field name="R" since="30"/>
 		<field name="S" since="31"/>
+		<field name="S_V2" since="33"/>
 	</class>
 	<class name="android/os/Bundle" since="1">
 		<extends name="android/os/BaseBundle" since="21"/>
@@ -43087,6 +43147,7 @@
 		<field name="ACTION_SEARCH_SETTINGS" since="8"/>
 		<field name="ACTION_SECURITY_SETTINGS"/>
 		<field name="ACTION_SETTINGS"/>
+		<field name="ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY" since="33"/>
 		<field name="ACTION_SHOW_REGULATORY_INFO" since="21"/>
 		<field name="ACTION_SHOW_WORK_POLICY_INFO" since="30"/>
 		<field name="ACTION_SOUND_SETTINGS"/>
@@ -43127,6 +43188,8 @@
 		<field name="EXTRA_EASY_CONNECT_ERROR_CODE" since="30"/>
 		<field name="EXTRA_INPUT_METHOD_ID" since="11"/>
 		<field name="EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME" since="30"/>
+		<field name="EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY" since="33"/>
+		<field name="EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI" since="33"/>
 		<field name="EXTRA_SUB_ID" since="28"/>
 		<field name="EXTRA_WIFI_NETWORK_LIST" since="30"/>
 		<field name="EXTRA_WIFI_NETWORK_RESULT_LIST" since="30"/>
@@ -47145,6 +47208,12 @@
 		<method name="getEnd()I"/>
 		<method name="getStart()I"/>
 	</class>
+	<class name="android/service/voice/VisibleActivityInfo" since="33">
+		<extends name="java/lang/Object"/>
+		<implements name="android/os/Parcelable"/>
+		<method name="getActivityId()Landroid/service/voice/VoiceInteractionSession$ActivityId;"/>
+		<field name="CREATOR"/>
+	</class>
 	<class name="android/service/voice/VoiceInteractionService" since="21">
 		<extends name="android/app/Service"/>
 		<method name="&lt;init>()V"/>
@@ -47204,6 +47273,7 @@
 		<method name="onTaskFinished(Landroid/content/Intent;I)V" since="23"/>
 		<method name="onTaskStarted(Landroid/content/Intent;I)V" since="23"/>
 		<method name="performDirectAction(Landroid/app/DirectAction;Landroid/os/Bundle;Landroid/os/CancellationSignal;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V" since="29"/>
+		<method name="registerVisibleActivityCallback(Ljava/util/concurrent/Executor;Landroid/service/voice/VoiceInteractionSession$VisibleActivityCallback;)V" since="33"/>
 		<method name="requestDirectActions(Landroid/service/voice/VoiceInteractionSession$ActivityId;Landroid/os/CancellationSignal;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V" since="29"/>
 		<method name="setContentView(Landroid/view/View;)V"/>
 		<method name="setDisabledShowContext(I)V" since="23"/>
@@ -47213,6 +47283,7 @@
 		<method name="show(Landroid/os/Bundle;I)V" since="23"/>
 		<method name="startAssistantActivity(Landroid/content/Intent;)V" since="26"/>
 		<method name="startVoiceActivity(Landroid/content/Intent;)V" since="23"/>
+		<method name="unregisterVisibleActivityCallback(Landroid/service/voice/VoiceInteractionSession$VisibleActivityCallback;)V" since="33"/>
 		<field name="SHOW_SOURCE_ACTIVITY" since="24"/>
 		<field name="SHOW_SOURCE_APPLICATION" since="23"/>
 		<field name="SHOW_SOURCE_ASSIST_GESTURE" since="23"/>
@@ -47285,6 +47356,10 @@
 		<method name="getExtras()Landroid/os/Bundle;"/>
 		<method name="isActive()Z"/>
 	</class>
+	<class name="android/service/voice/VoiceInteractionSession$VisibleActivityCallback" since="33">
+		<method name="onInvisible(Landroid/service/voice/VoiceInteractionSession$ActivityId;)V"/>
+		<method name="onVisible(Landroid/service/voice/VisibleActivityInfo;)V"/>
+	</class>
 	<class name="android/service/voice/VoiceInteractionSessionService" since="21">
 		<extends name="android/app/Service"/>
 		<method name="&lt;init>()V"/>
@@ -52627,140 +52702,140 @@
 	</class>
 	<class name="android/test/ActivityInstrumentationTestCase" since="1" deprecated="3">
 		<extends name="android/test/ActivityTestCase"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;Z)V" deprecated="32"/>
-		<method name="testActivityTestCaseSetUpProperly()V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;Z)V" deprecated="33"/>
+		<method name="testActivityTestCaseSetUpProperly()V" deprecated="33"/>
 	</class>
 	<class name="android/test/ActivityInstrumentationTestCase2" since="3" deprecated="24">
 		<extends name="android/test/ActivityTestCase"/>
-		<method name="&lt;init>(Ljava/lang/Class;)V" since="8" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;)V" since="8" deprecated="33"/>
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="15"/>
-		<method name="setActivityInitialTouchMode(Z)V" deprecated="32"/>
-		<method name="setActivityIntent(Landroid/content/Intent;)V" deprecated="32"/>
+		<method name="setActivityInitialTouchMode(Z)V" deprecated="33"/>
+		<method name="setActivityIntent(Landroid/content/Intent;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/ActivityTestCase" since="1" deprecated="24">
 		<extends name="android/test/InstrumentationTestCase"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="getActivity()Landroid/app/Activity;" deprecated="32"/>
-		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="setActivity(Landroid/app/Activity;)V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="getActivity()Landroid/app/Activity;" deprecated="33"/>
+		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="setActivity(Landroid/app/Activity;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/ActivityUnitTestCase" since="1" deprecated="24">
 		<extends name="android/test/ActivityTestCase"/>
-		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="getFinishedActivityRequest()I" deprecated="32"/>
-		<method name="getRequestedOrientation()I" deprecated="32"/>
-		<method name="getStartedActivityIntent()Landroid/content/Intent;" deprecated="32"/>
-		<method name="getStartedActivityRequest()I" deprecated="32"/>
-		<method name="isFinishCalled()Z" deprecated="32"/>
-		<method name="setActivityContext(Landroid/content/Context;)V" deprecated="32"/>
-		<method name="setApplication(Landroid/app/Application;)V" deprecated="32"/>
-		<method name="startActivity(Landroid/content/Intent;Landroid/os/Bundle;Ljava/lang/Object;)Landroid/app/Activity;" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="getFinishedActivityRequest()I" deprecated="33"/>
+		<method name="getRequestedOrientation()I" deprecated="33"/>
+		<method name="getStartedActivityIntent()Landroid/content/Intent;" deprecated="33"/>
+		<method name="getStartedActivityRequest()I" deprecated="33"/>
+		<method name="isFinishCalled()Z" deprecated="33"/>
+		<method name="setActivityContext(Landroid/content/Context;)V" deprecated="33"/>
+		<method name="setApplication(Landroid/app/Application;)V" deprecated="33"/>
+		<method name="startActivity(Landroid/content/Intent;Landroid/os/Bundle;Ljava/lang/Object;)Landroid/app/Activity;" deprecated="33"/>
 	</class>
 	<class name="android/test/AndroidTestCase" since="1" deprecated="24">
 		<extends name="junit/framework/TestCase"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="assertActivityRequiresPermission(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" since="4" deprecated="32"/>
-		<method name="assertReadingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="32"/>
-		<method name="assertWritingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="32"/>
-		<method name="getContext()Landroid/content/Context;" deprecated="32"/>
-		<method name="getTestContext()Landroid/content/Context;" since="32" deprecated="32"/>
-		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="setContext(Landroid/content/Context;)V" deprecated="32"/>
-		<method name="setTestContext(Landroid/content/Context;)V" since="32" deprecated="32"/>
-		<method name="testAndroidTestCaseSetupProperly()V" deprecated="32"/>
-		<field name="mContext" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="assertActivityRequiresPermission(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" since="4" deprecated="33"/>
+		<method name="assertReadingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="33"/>
+		<method name="assertWritingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" deprecated="33"/>
+		<method name="getContext()Landroid/content/Context;" deprecated="33"/>
+		<method name="getTestContext()Landroid/content/Context;" since="33" deprecated="33"/>
+		<method name="scrubClass(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="setContext(Landroid/content/Context;)V" deprecated="33"/>
+		<method name="setTestContext(Landroid/content/Context;)V" since="33" deprecated="33"/>
+		<method name="testAndroidTestCaseSetupProperly()V" deprecated="33"/>
+		<field name="mContext" deprecated="33"/>
 	</class>
 	<class name="android/test/AndroidTestRunner" since="1" deprecated="24">
 		<extends name="junit/runner/BaseTestRunner"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="addTestListener(Ljunit/framework/TestListener;)V" deprecated="32"/>
-		<method name="clearTestListeners()V" deprecated="32"/>
-		<method name="createTestResult()Ljunit/framework/TestResult;" deprecated="32"/>
-		<method name="getTestCases()Ljava/util/List;" deprecated="32"/>
-		<method name="getTestClassName()Ljava/lang/String;" deprecated="32"/>
-		<method name="getTestResult()Ljunit/framework/TestResult;" deprecated="32"/>
-		<method name="runTest()V" deprecated="32"/>
-		<method name="runTest(Ljunit/framework/TestResult;)V" deprecated="32"/>
-		<method name="setContext(Landroid/content/Context;)V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="addTestListener(Ljunit/framework/TestListener;)V" deprecated="33"/>
+		<method name="clearTestListeners()V" deprecated="33"/>
+		<method name="createTestResult()Ljunit/framework/TestResult;" deprecated="33"/>
+		<method name="getTestCases()Ljava/util/List;" deprecated="33"/>
+		<method name="getTestClassName()Ljava/lang/String;" deprecated="33"/>
+		<method name="getTestResult()Ljunit/framework/TestResult;" deprecated="33"/>
+		<method name="runTest()V" deprecated="33"/>
+		<method name="runTest(Ljunit/framework/TestResult;)V" deprecated="33"/>
+		<method name="setContext(Landroid/content/Context;)V" deprecated="33"/>
 		<method name="setInstrumentaiton(Landroid/app/Instrumentation;)V" deprecated="15"/>
-		<method name="setInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="32"/>
-		<method name="setTest(Ljunit/framework/Test;)V" deprecated="32"/>
-		<method name="setTestClassName(Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
+		<method name="setInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="33"/>
+		<method name="setTest(Ljunit/framework/Test;)V" deprecated="33"/>
+		<method name="setTestClassName(Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/ApplicationTestCase" since="1" deprecated="24">
 		<extends name="android/test/AndroidTestCase"/>
-		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="createApplication()V" deprecated="32"/>
-		<method name="getApplication()Landroid/app/Application;" deprecated="32"/>
-		<method name="getSystemContext()Landroid/content/Context;" deprecated="32"/>
-		<method name="terminateApplication()V" deprecated="32"/>
-		<method name="testApplicationTestCaseSetUpProperly()V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="createApplication()V" deprecated="33"/>
+		<method name="getApplication()Landroid/app/Application;" deprecated="33"/>
+		<method name="getSystemContext()Landroid/content/Context;" deprecated="33"/>
+		<method name="terminateApplication()V" deprecated="33"/>
+		<method name="testApplicationTestCaseSetUpProperly()V" deprecated="33"/>
 	</class>
 	<class name="android/test/AssertionFailedError" since="1" deprecated="16">
 		<extends name="java/lang/Error"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/String;)V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/String;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/ComparisonFailure" since="1" deprecated="16">
 		<extends name="android/test/AssertionFailedError"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/FlakyTest" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
 		<implements name="java/lang/annotation/Annotation"/>
-		<method name="tolerance()I" deprecated="32"/>
+		<method name="tolerance()I" deprecated="33"/>
 	</class>
 	<class name="android/test/InstrumentationTestCase" since="1" deprecated="24">
 		<extends name="junit/framework/TestCase"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="getInstrumentation()Landroid/app/Instrumentation;" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="getInstrumentation()Landroid/app/Instrumentation;" deprecated="33"/>
 		<method name="injectInsrumentation(Landroid/app/Instrumentation;)V" deprecated="15"/>
-		<method name="injectInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="32"/>
-		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)Landroid/app/Activity;" deprecated="32"/>
-		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)Landroid/app/Activity;" since="3" deprecated="32"/>
-		<method name="runTestOnUiThread(Ljava/lang/Runnable;)V" since="3" deprecated="32"/>
-		<method name="sendKeys(Ljava/lang/String;)V" deprecated="32"/>
-		<method name="sendKeys([I)V" deprecated="32"/>
-		<method name="sendRepeatedKeys([I)V" deprecated="32"/>
+		<method name="injectInstrumentation(Landroid/app/Instrumentation;)V" since="5" deprecated="33"/>
+		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)Landroid/app/Activity;" deprecated="33"/>
+		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)Landroid/app/Activity;" since="3" deprecated="33"/>
+		<method name="runTestOnUiThread(Ljava/lang/Runnable;)V" since="3" deprecated="33"/>
+		<method name="sendKeys(Ljava/lang/String;)V" deprecated="33"/>
+		<method name="sendKeys([I)V" deprecated="33"/>
+		<method name="sendRepeatedKeys([I)V" deprecated="33"/>
 	</class>
 	<class name="android/test/InstrumentationTestRunner" since="1" deprecated="24">
 		<extends name="android/app/Instrumentation"/>
 		<implements name="android/test/TestSuiteProvider"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="addTestListener(Ljunit/framework/TestListener;)V" since="32" deprecated="32"/>
-		<method name="getAllTests()Ljunit/framework/TestSuite;" deprecated="32"/>
-		<method name="getAndroidTestRunner()Landroid/test/AndroidTestRunner;" deprecated="32"/>
-		<method name="getArguments()Landroid/os/Bundle;" since="18" deprecated="32"/>
-		<method name="getLoader()Ljava/lang/ClassLoader;" deprecated="32"/>
-		<field name="REPORT_KEY_NAME_CLASS" deprecated="32"/>
-		<field name="REPORT_KEY_NAME_TEST" deprecated="32"/>
-		<field name="REPORT_KEY_NUM_CURRENT" deprecated="32"/>
-		<field name="REPORT_KEY_NUM_TOTAL" deprecated="32"/>
-		<field name="REPORT_KEY_STACK" deprecated="32"/>
-		<field name="REPORT_VALUE_ID" deprecated="32"/>
-		<field name="REPORT_VALUE_RESULT_ERROR" deprecated="32"/>
-		<field name="REPORT_VALUE_RESULT_FAILURE" deprecated="32"/>
-		<field name="REPORT_VALUE_RESULT_OK" deprecated="32"/>
-		<field name="REPORT_VALUE_RESULT_START" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="addTestListener(Ljunit/framework/TestListener;)V" since="33" deprecated="33"/>
+		<method name="getAllTests()Ljunit/framework/TestSuite;" deprecated="33"/>
+		<method name="getAndroidTestRunner()Landroid/test/AndroidTestRunner;" deprecated="33"/>
+		<method name="getArguments()Landroid/os/Bundle;" since="18" deprecated="33"/>
+		<method name="getLoader()Ljava/lang/ClassLoader;" deprecated="33"/>
+		<field name="REPORT_KEY_NAME_CLASS" deprecated="33"/>
+		<field name="REPORT_KEY_NAME_TEST" deprecated="33"/>
+		<field name="REPORT_KEY_NUM_CURRENT" deprecated="33"/>
+		<field name="REPORT_KEY_NUM_TOTAL" deprecated="33"/>
+		<field name="REPORT_KEY_STACK" deprecated="33"/>
+		<field name="REPORT_VALUE_ID" deprecated="33"/>
+		<field name="REPORT_VALUE_RESULT_ERROR" deprecated="33"/>
+		<field name="REPORT_VALUE_RESULT_FAILURE" deprecated="33"/>
+		<field name="REPORT_VALUE_RESULT_OK" deprecated="33"/>
+		<field name="REPORT_VALUE_RESULT_START" deprecated="33"/>
 	</class>
 	<class name="android/test/InstrumentationTestSuite" since="1" deprecated="24">
 		<extends name="junit/framework/TestSuite"/>
-		<method name="&lt;init>(Landroid/app/Instrumentation;)V" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/Class;Landroid/app/Instrumentation;)V" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/String;Landroid/app/Instrumentation;)V" deprecated="32"/>
+		<method name="&lt;init>(Landroid/app/Instrumentation;)V" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/Class;Landroid/app/Instrumentation;)V" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/String;Landroid/app/Instrumentation;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/IsolatedContext" since="1" deprecated="24">
 		<extends name="android/content/ContextWrapper"/>
-		<method name="&lt;init>(Landroid/content/ContentResolver;Landroid/content/Context;)V" deprecated="32"/>
-		<method name="getAndClearBroadcastIntents()Ljava/util/List;" deprecated="32"/>
+		<method name="&lt;init>(Landroid/content/ContentResolver;Landroid/content/Context;)V" deprecated="33"/>
+		<method name="getAndClearBroadcastIntents()Ljava/util/List;" deprecated="33"/>
 	</class>
-	<class name="android/test/LaunchPerformanceBase" since="32" deprecated="32">
+	<class name="android/test/LaunchPerformanceBase" since="33" deprecated="33">
 		<extends name="android/app/Instrumentation"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="LaunchApp()V" deprecated="32"/>
-		<field name="mIntent" deprecated="32"/>
-		<field name="mResults" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="LaunchApp()V" deprecated="33"/>
+		<field name="mIntent" deprecated="33"/>
+		<field name="mResults" deprecated="33"/>
 	</class>
 	<class name="android/test/LoaderTestCase" since="11">
 		<extends name="android/test/AndroidTestCase"/>
@@ -52769,63 +52844,63 @@
 	</class>
 	<class name="android/test/MoreAsserts" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
-		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32"/>
-		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32"/>
-		<method name="assertContentsInAnyOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertContentsInAnyOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertContentsInOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertContentsInOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertEmpty(Ljava/lang/Iterable;)V" deprecated="32"/>
-		<method name="assertEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="32"/>
-		<method name="assertEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="32"/>
-		<method name="assertEmpty(Ljava/util/Map;)V" deprecated="32"/>
-		<method name="assertEquals(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V" deprecated="32"/>
-		<method name="assertEquals(Ljava/lang/String;[B[B)V" deprecated="32"/>
-		<method name="assertEquals(Ljava/lang/String;[D[D)V" deprecated="32"/>
-		<method name="assertEquals(Ljava/lang/String;[I[I)V" deprecated="32"/>
-		<method name="assertEquals(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertEquals(Ljava/util/Set;Ljava/util/Set;)V" deprecated="32"/>
-		<method name="assertEquals([B[B)V" deprecated="32"/>
-		<method name="assertEquals([D[D)V" deprecated="32"/>
-		<method name="assertEquals([I[I)V" deprecated="32"/>
-		<method name="assertEquals([Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32"/>
-		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="32"/>
-		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="assertNotEmpty(Ljava/lang/Iterable;)V" deprecated="32"/>
-		<method name="assertNotEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="32"/>
-		<method name="assertNotEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="32"/>
-		<method name="assertNotEmpty(Ljava/util/Map;)V" deprecated="32"/>
-		<method name="assertNotEqual(Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertNotEqual(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="32"/>
-		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="32"/>
-		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="32"/>
+		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33"/>
+		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33"/>
+		<method name="assertContentsInAnyOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertContentsInAnyOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertContentsInOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertContentsInOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertEmpty(Ljava/lang/Iterable;)V" deprecated="33"/>
+		<method name="assertEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="33"/>
+		<method name="assertEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="33"/>
+		<method name="assertEmpty(Ljava/util/Map;)V" deprecated="33"/>
+		<method name="assertEquals(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V" deprecated="33"/>
+		<method name="assertEquals(Ljava/lang/String;[B[B)V" deprecated="33"/>
+		<method name="assertEquals(Ljava/lang/String;[D[D)V" deprecated="33"/>
+		<method name="assertEquals(Ljava/lang/String;[I[I)V" deprecated="33"/>
+		<method name="assertEquals(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertEquals(Ljava/util/Set;Ljava/util/Set;)V" deprecated="33"/>
+		<method name="assertEquals([B[B)V" deprecated="33"/>
+		<method name="assertEquals([D[D)V" deprecated="33"/>
+		<method name="assertEquals([I[I)V" deprecated="33"/>
+		<method name="assertEquals([Ljava/lang/Object;[Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33"/>
+		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" deprecated="33"/>
+		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="assertNotEmpty(Ljava/lang/Iterable;)V" deprecated="33"/>
+		<method name="assertNotEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" deprecated="33"/>
+		<method name="assertNotEmpty(Ljava/lang/String;Ljava/util/Map;)V" deprecated="33"/>
+		<method name="assertNotEmpty(Ljava/util/Map;)V" deprecated="33"/>
+		<method name="assertNotEqual(Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertNotEqual(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V" deprecated="33"/>
+		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="33"/>
+		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Z)V" deprecated="33"/>
 	</class>
 	<class name="android/test/PerformanceTestCase" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
-		<method name="isPerformanceOnly()Z" deprecated="32"/>
-		<method name="startPerformance(Landroid/test/PerformanceTestCase$Intermediates;)I" deprecated="32"/>
+		<method name="isPerformanceOnly()Z" deprecated="33"/>
+		<method name="startPerformance(Landroid/test/PerformanceTestCase$Intermediates;)I" deprecated="33"/>
 	</class>
-	<class name="android/test/PerformanceTestCase$Intermediates" since="1" deprecated="32">
+	<class name="android/test/PerformanceTestCase$Intermediates" since="1" deprecated="33">
 		<extends name="java/lang/Object"/>
-		<method name="addIntermediate(Ljava/lang/String;)V" deprecated="32"/>
-		<method name="addIntermediate(Ljava/lang/String;J)V" deprecated="32"/>
-		<method name="finishTiming(Z)V" deprecated="32"/>
-		<method name="setInternalIterations(I)V" deprecated="32"/>
-		<method name="startTiming(Z)V" deprecated="32"/>
+		<method name="addIntermediate(Ljava/lang/String;)V" deprecated="33"/>
+		<method name="addIntermediate(Ljava/lang/String;J)V" deprecated="33"/>
+		<method name="finishTiming(Z)V" deprecated="33"/>
+		<method name="setInternalIterations(I)V" deprecated="33"/>
+		<method name="startTiming(Z)V" deprecated="33"/>
 	</class>
 	<class name="android/test/ProviderTestCase" since="1" deprecated="5">
 		<extends name="android/test/InstrumentationTestCase"/>
-		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="getMockContentResolver()Landroid/test/mock/MockContentResolver;" deprecated="32"/>
-		<method name="getMockContext()Landroid/test/IsolatedContext;" deprecated="32"/>
-		<method name="getProvider()Landroid/content/ContentProvider;" deprecated="32"/>
-		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="getMockContentResolver()Landroid/test/mock/MockContentResolver;" deprecated="33"/>
+		<method name="getMockContext()Landroid/test/IsolatedContext;" deprecated="33"/>
+		<method name="getProvider()Landroid/content/ContentProvider;" deprecated="33"/>
+		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" deprecated="33"/>
 	</class>
 	<class name="android/test/ProviderTestCase2" since="3">
 		<extends name="android/test/AndroidTestCase"/>
@@ -52837,81 +52912,81 @@
 	</class>
 	<class name="android/test/RenamingDelegatingContext" since="1" deprecated="24">
 		<extends name="android/content/ContextWrapper"/>
-		<method name="&lt;init>(Landroid/content/Context;Landroid/content/Context;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;)V" deprecated="32"/>
-		<method name="getDatabasePrefix()Ljava/lang/String;" deprecated="32"/>
-		<method name="makeExistingFilesAndDbsAccessible()V" deprecated="32"/>
-		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;)Landroid/content/ContentProvider;" deprecated="32"/>
-		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)Landroid/content/ContentProvider;" deprecated="32"/>
+		<method name="&lt;init>(Landroid/content/Context;Landroid/content/Context;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;)V" deprecated="33"/>
+		<method name="getDatabasePrefix()Ljava/lang/String;" deprecated="33"/>
+		<method name="makeExistingFilesAndDbsAccessible()V" deprecated="33"/>
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;)Landroid/content/ContentProvider;" deprecated="33"/>
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)Landroid/content/ContentProvider;" deprecated="33"/>
 	</class>
-	<class name="android/test/RepetitiveTest" since="32" deprecated="32">
+	<class name="android/test/RepetitiveTest" since="33" deprecated="33">
 		<extends name="java/lang/Object"/>
 		<implements name="java/lang/annotation/Annotation"/>
-		<method name="numIterations()I" deprecated="32"/>
+		<method name="numIterations()I" deprecated="33"/>
 	</class>
 	<class name="android/test/ServiceTestCase" since="1" deprecated="24">
 		<extends name="android/test/AndroidTestCase"/>
-		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="bindService(Landroid/content/Intent;)Landroid/os/IBinder;" deprecated="32"/>
-		<method name="getApplication()Landroid/app/Application;" deprecated="32"/>
-		<method name="getService()Landroid/app/Service;" deprecated="32"/>
-		<method name="getSystemContext()Landroid/content/Context;" deprecated="32"/>
-		<method name="setApplication(Landroid/app/Application;)V" deprecated="32"/>
-		<method name="setupService()V" deprecated="32"/>
-		<method name="shutdownService()V" deprecated="32"/>
-		<method name="startService(Landroid/content/Intent;)V" deprecated="32"/>
-		<method name="testServiceTestCaseSetUpProperly()V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="bindService(Landroid/content/Intent;)Landroid/os/IBinder;" deprecated="33"/>
+		<method name="getApplication()Landroid/app/Application;" deprecated="33"/>
+		<method name="getService()Landroid/app/Service;" deprecated="33"/>
+		<method name="getSystemContext()Landroid/content/Context;" deprecated="33"/>
+		<method name="setApplication(Landroid/app/Application;)V" deprecated="33"/>
+		<method name="setupService()V" deprecated="33"/>
+		<method name="shutdownService()V" deprecated="33"/>
+		<method name="startService(Landroid/content/Intent;)V" deprecated="33"/>
+		<method name="testServiceTestCaseSetUpProperly()V" deprecated="33"/>
 	</class>
 	<class name="android/test/SingleLaunchActivityTestCase" since="1" deprecated="24">
 		<extends name="android/test/InstrumentationTestCase"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="getActivity()Landroid/app/Activity;" deprecated="32"/>
-		<method name="testActivityTestCaseSetUpProperly()V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="getActivity()Landroid/app/Activity;" deprecated="33"/>
+		<method name="testActivityTestCaseSetUpProperly()V" deprecated="33"/>
 	</class>
 	<class name="android/test/SyncBaseInstrumentation" since="1" deprecated="24">
 		<extends name="android/test/InstrumentationTestCase"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="cancelSyncsandDisableAutoSync()V" deprecated="32"/>
-		<method name="syncProvider(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="cancelSyncsandDisableAutoSync()V" deprecated="33"/>
+		<method name="syncProvider(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/TestSuiteProvider" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
-		<method name="getTestSuite()Ljunit/framework/TestSuite;" deprecated="32"/>
+		<method name="getTestSuite()Ljunit/framework/TestSuite;" deprecated="33"/>
 	</class>
 	<class name="android/test/TouchUtils" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="clickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="clickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="33"/>
 		<method name="drag(Landroid/test/ActivityInstrumentationTestCase;FFFFI)V" deprecated="15"/>
-		<method name="drag(Landroid/test/InstrumentationTestCase;FFFFI)V" since="3" deprecated="32"/>
+		<method name="drag(Landroid/test/InstrumentationTestCase;FFFFI)V" since="3" deprecated="33"/>
 		<method name="dragQuarterScreenDown(Landroid/test/ActivityInstrumentationTestCase;)V" deprecated="15"/>
-		<method name="dragQuarterScreenDown(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="32"/>
+		<method name="dragQuarterScreenDown(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="33"/>
 		<method name="dragQuarterScreenUp(Landroid/test/ActivityInstrumentationTestCase;)V" deprecated="15"/>
-		<method name="dragQuarterScreenUp(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="32"/>
+		<method name="dragQuarterScreenUp(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;)V" since="3" deprecated="33"/>
 		<method name="dragViewBy(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;III)I" deprecated="15"/>
 		<method name="dragViewBy(Landroid/test/InstrumentationTestCase;Landroid/view/View;III)I" since="3" deprecated="15"/>
 		<method name="dragViewTo(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;III)I" deprecated="15"/>
-		<method name="dragViewTo(Landroid/test/InstrumentationTestCase;Landroid/view/View;III)I" since="3" deprecated="32"/>
+		<method name="dragViewTo(Landroid/test/InstrumentationTestCase;Landroid/view/View;III)I" since="3" deprecated="33"/>
 		<method name="dragViewToBottom(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;)V" deprecated="15"/>
 		<method name="dragViewToBottom(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;I)V" deprecated="15"/>
-		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;)V" since="3" deprecated="32"/>
-		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;I)V" since="3" deprecated="32"/>
+		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;)V" since="3" deprecated="33"/>
+		<method name="dragViewToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/View;I)V" since="3" deprecated="33"/>
 		<method name="dragViewToTop(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;)V" deprecated="15"/>
 		<method name="dragViewToTop(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;I)V" deprecated="15"/>
-		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="32"/>
-		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;I)V" since="3" deprecated="32"/>
+		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="33"/>
+		<method name="dragViewToTop(Landroid/test/InstrumentationTestCase;Landroid/view/View;I)V" since="3" deprecated="33"/>
 		<method name="dragViewToX(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;II)I" deprecated="15"/>
-		<method name="dragViewToX(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="32"/>
+		<method name="dragViewToX(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="33"/>
 		<method name="dragViewToY(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;II)I" deprecated="15"/>
-		<method name="dragViewToY(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="32"/>
+		<method name="dragViewToY(Landroid/test/InstrumentationTestCase;Landroid/view/View;II)I" since="3" deprecated="33"/>
 		<method name="longClickView(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/View;)V" deprecated="15"/>
-		<method name="longClickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="32"/>
+		<method name="longClickView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" since="3" deprecated="33"/>
 		<method name="scrollToBottom(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/ViewGroup;)V" deprecated="15"/>
-		<method name="scrollToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="32"/>
+		<method name="scrollToBottom(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="33"/>
 		<method name="scrollToTop(Landroid/test/ActivityInstrumentationTestCase;Landroid/view/ViewGroup;)V" deprecated="15"/>
-		<method name="scrollToTop(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="32"/>
-		<method name="tapView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="32"/>
-		<method name="touchAndCancelView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="32"/>
+		<method name="scrollToTop(Landroid/test/InstrumentationTestCase;Landroid/app/Activity;Landroid/view/ViewGroup;)V" since="3" deprecated="33"/>
+		<method name="tapView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="33"/>
+		<method name="touchAndCancelView(Landroid/test/InstrumentationTestCase;Landroid/view/View;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/UiThreadTest" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
@@ -52919,39 +52994,39 @@
 	</class>
 	<class name="android/test/ViewAsserts" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
-		<method name="assertBaselineAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32"/>
-		<method name="assertGroupContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertGroupIntegrity(Landroid/view/ViewGroup;)V" deprecated="32"/>
-		<method name="assertGroupNotContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertHasScreenCoordinates(Landroid/view/View;Landroid/view/View;II)V" deprecated="32"/>
-		<method name="assertHorizontalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32"/>
-		<method name="assertOffScreenAbove(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertOffScreenBelow(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertOnScreen(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32"/>
-		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
-		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="32"/>
-		<method name="assertVerticalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="32"/>
+		<method name="assertBaselineAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33"/>
+		<method name="assertGroupContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertGroupIntegrity(Landroid/view/ViewGroup;)V" deprecated="33"/>
+		<method name="assertGroupNotContains(Landroid/view/ViewGroup;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertHasScreenCoordinates(Landroid/view/View;Landroid/view/View;II)V" deprecated="33"/>
+		<method name="assertHorizontalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertLeftAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33"/>
+		<method name="assertOffScreenAbove(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertOffScreenBelow(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertOnScreen(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertRightAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33"/>
+		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
+		<method name="assertTopAligned(Landroid/view/View;Landroid/view/View;I)V" deprecated="33"/>
+		<method name="assertVerticalCenterAligned(Landroid/view/View;Landroid/view/View;)V" deprecated="33"/>
 	</class>
-	<class name="android/test/mock/MockAccountManager" since="32" deprecated="32">
+	<class name="android/test/mock/MockAccountManager" since="33" deprecated="33">
 		<extends name="java/lang/Object"/>
-		<method name="newMockAccountManager(Landroid/content/Context;)Landroid/accounts/AccountManager;" deprecated="32"/>
+		<method name="newMockAccountManager(Landroid/content/Context;)Landroid/accounts/AccountManager;" deprecated="33"/>
 	</class>
 	<class name="android/test/mock/MockApplication" since="1" deprecated="24">
 		<extends name="android/app/Application"/>
-		<method name="&lt;init>()V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
 	</class>
 	<class name="android/test/mock/MockContentProvider" since="8">
 		<extends name="android/content/ContentProvider"/>
 		<method name="&lt;init>()V"/>
 		<method name="&lt;init>(Landroid/content/Context;)V"/>
 		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Landroid/content/pm/PathPermission;)V"/>
-		<method name="attachInfoForTesting(Landroid/content/ContentProvider;Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V" since="32" deprecated="32"/>
+		<method name="attachInfoForTesting(Landroid/content/ContentProvider;Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V" since="33" deprecated="33"/>
 	</class>
 	<class name="android/test/mock/MockContentResolver" since="1">
 		<extends name="android/content/ContentResolver"/>
@@ -52968,7 +53043,7 @@
 	<class name="android/test/mock/MockCursor" since="8" deprecated="24">
 		<extends name="java/lang/Object"/>
 		<implements name="android/database/Cursor"/>
-		<method name="&lt;init>()V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
 		<method name="abortUpdates()V" removed="11"/>
 		<method name="commitUpdates()Z" removed="11"/>
 		<method name="commitUpdates(Ljava/util/Map;)Z" removed="11"/>
@@ -52987,58 +53062,58 @@
 	<class name="android/test/mock/MockDialogInterface" since="1" deprecated="24">
 		<extends name="java/lang/Object"/>
 		<implements name="android/content/DialogInterface"/>
-		<method name="&lt;init>()V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
 	</class>
 	<class name="android/test/mock/MockPackageManager" since="1" deprecated="24">
 		<extends name="android/content/pm/PackageManager"/>
-		<method name="&lt;init>()V" deprecated="32"/>
-		<method name="getAllIntentFilters(Ljava/lang/String;)Ljava/util/List;" since="23" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
+		<method name="getAllIntentFilters(Ljava/lang/String;)Ljava/util/List;" since="23" deprecated="33"/>
 		<method name="getDefaultBrowserPackageName(I)Ljava/lang/String;" since="23" removed="24"/>
-		<method name="resolveServiceAsUser(Landroid/content/Intent;II)Landroid/content/pm/ResolveInfo;" since="32" deprecated="32"/>
+		<method name="resolveServiceAsUser(Landroid/content/Intent;II)Landroid/content/pm/ResolveInfo;" since="33" deprecated="33"/>
 		<method name="setDefaultBrowserPackageName(Ljava/lang/String;I)Z" since="23" removed="24"/>
 		<method name="setPackageObbPath(Ljava/lang/String;Ljava/lang/String;)V" since="9" removed="10"/>
 	</class>
 	<class name="android/test/mock/MockResources" since="1" deprecated="24">
 		<extends name="android/content/res/Resources"/>
-		<method name="&lt;init>()V" deprecated="32"/>
+		<method name="&lt;init>()V" deprecated="33"/>
 	</class>
-	<class name="android/test/mock/MockService" since="32" deprecated="32">
+	<class name="android/test/mock/MockService" since="33" deprecated="33">
 		<extends name="java/lang/Object"/>
-		<method name="attachForTesting(Landroid/app/Service;Landroid/content/Context;Ljava/lang/String;Landroid/app/Application;)V" deprecated="32"/>
+		<method name="attachForTesting(Landroid/app/Service;Landroid/content/Context;Ljava/lang/String;Landroid/app/Application;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/suitebuilder/TestMethod" since="1" deprecated="26">
 		<extends name="java/lang/Object"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" since="3" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/reflect/Method;Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="&lt;init>(Ljunit/framework/TestCase;)V" since="3" deprecated="32"/>
-		<method name="createTest()Ljunit/framework/TestCase;" deprecated="32"/>
-		<method name="getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;" deprecated="32"/>
-		<method name="getEnclosingClass()Ljava/lang/Class;" deprecated="32"/>
-		<method name="getEnclosingClassname()Ljava/lang/String;" deprecated="32"/>
-		<method name="getName()Ljava/lang/String;" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" since="3" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/reflect/Method;Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="&lt;init>(Ljunit/framework/TestCase;)V" since="3" deprecated="33"/>
+		<method name="createTest()Ljunit/framework/TestCase;" deprecated="33"/>
+		<method name="getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;" deprecated="33"/>
+		<method name="getEnclosingClass()Ljava/lang/Class;" deprecated="33"/>
+		<method name="getEnclosingClassname()Ljava/lang/String;" deprecated="33"/>
+		<method name="getName()Ljava/lang/String;" deprecated="33"/>
 	</class>
 	<class name="android/test/suitebuilder/TestSuiteBuilder" since="1" deprecated="26">
 		<extends name="java/lang/Object"/>
-		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="33"/>
 		<method name="addRequirements(Ljava/util/List;)Landroid/test/suitebuilder/TestSuiteBuilder;" removed="28"/>
 		<method name="addRequirements([Lcom/android/internal/util/Predicate;)Landroid/test/suitebuilder/TestSuiteBuilder;" removed="28"/>
-		<method name="build()Ljunit/framework/TestSuite;" deprecated="32"/>
-		<method name="excludePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32"/>
-		<method name="getSuiteName()Ljava/lang/String;" deprecated="32"/>
-		<method name="includeAllPackagesUnderHere()Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32"/>
-		<method name="includePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32"/>
-		<method name="named(Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="32"/>
+		<method name="build()Ljunit/framework/TestSuite;" deprecated="33"/>
+		<method name="excludePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33"/>
+		<method name="getSuiteName()Ljava/lang/String;" deprecated="33"/>
+		<method name="includeAllPackagesUnderHere()Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33"/>
+		<method name="includePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33"/>
+		<method name="named(Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" deprecated="33"/>
 	</class>
 	<class name="android/test/suitebuilder/TestSuiteBuilder$FailedToCreateTests" since="1" deprecated="26">
 		<extends name="junit/framework/TestCase"/>
-		<method name="&lt;init>(Ljava/lang/Exception;)V" deprecated="32"/>
-		<method name="testSuiteConstructionFailed()V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Exception;)V" deprecated="33"/>
+		<method name="testSuiteConstructionFailed()V" deprecated="33"/>
 	</class>
-	<class name="android/test/suitebuilder/UnitTestSuiteBuilder" since="32" deprecated="32">
+	<class name="android/test/suitebuilder/UnitTestSuiteBuilder" since="33" deprecated="33">
 		<extends name="android/test/suitebuilder/TestSuiteBuilder"/>
-		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="32"/>
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="32"/>
+		<method name="&lt;init>(Ljava/lang/Class;)V" deprecated="33"/>
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/ClassLoader;)V" deprecated="33"/>
 	</class>
 	<class name="android/test/suitebuilder/annotation/LargeTest" since="2" deprecated="24">
 		<extends name="java/lang/Object"/>
@@ -55864,8 +55939,14 @@
 	</class>
 	<class name="android/view/AttachedSurfaceControl" since="31">
 		<extends name="java/lang/Object"/>
+		<method name="addOnBufferTransformHintChangedListener(Landroid/view/AttachedSurfaceControl$OnBufferTransformHintChangedListener;)V" since="33"/>
 		<method name="applyTransactionOnDraw(Landroid/view/SurfaceControl$Transaction;)Z"/>
 		<method name="buildReparentTransaction(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;"/>
+		<method name="getBufferTransformHint()I" since="33"/>
+		<method name="removeOnBufferTransformHintChangedListener(Landroid/view/AttachedSurfaceControl$OnBufferTransformHintChangedListener;)V" since="33"/>
+	</class>
+	<class name="android/view/AttachedSurfaceControl$OnBufferTransformHintChangedListener" since="33">
+		<method name="onBufferTransformHintChanged(I)V"/>
 	</class>
 	<class name="android/view/Choreographer" since="16">
 		<extends name="java/lang/Object"/>
@@ -57365,6 +57446,12 @@
 		<method name="isValid()Z"/>
 		<method name="readFromParcel(Landroid/os/Parcel;)V"/>
 		<method name="release()V"/>
+		<field name="BUFFER_TRANSFORM_IDENTITY" since="33"/>
+		<field name="BUFFER_TRANSFORM_MIRROR_HORIZONTAL" since="33"/>
+		<field name="BUFFER_TRANSFORM_MIRROR_VERTICAL" since="33"/>
+		<field name="BUFFER_TRANSFORM_ROTATE_180" since="33"/>
+		<field name="BUFFER_TRANSFORM_ROTATE_270" since="33"/>
+		<field name="BUFFER_TRANSFORM_ROTATE_90" since="33"/>
 		<field name="CREATOR"/>
 	</class>
 	<class name="android/view/SurfaceControl$Builder" since="29">
@@ -58220,6 +58307,7 @@
 		<field name="AUTOFILL_TYPE_NONE" since="26"/>
 		<field name="AUTOFILL_TYPE_TEXT" since="26"/>
 		<field name="AUTOFILL_TYPE_TOGGLE" since="26"/>
+		<field name="DRAG_FLAG_ACCESSIBILITY_ACTION" since="33"/>
 		<field name="DRAG_FLAG_GLOBAL" since="24"/>
 		<field name="DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION" since="24"/>
 		<field name="DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION" since="24"/>
@@ -59651,6 +59739,9 @@
 		<method name="setPassword(Z)V" removed="14"/>
 		<method name="setRemovedCount(I)V" removed="14"/>
 		<field name="CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION" since="19"/>
+		<field name="CONTENT_CHANGE_TYPE_DRAG_CANCELLED" since="33"/>
+		<field name="CONTENT_CHANGE_TYPE_DRAG_DROPPED" since="33"/>
+		<field name="CONTENT_CHANGE_TYPE_DRAG_STARTED" since="33"/>
 		<field name="CONTENT_CHANGE_TYPE_PANE_APPEARED" since="28"/>
 		<field name="CONTENT_CHANGE_TYPE_PANE_DISAPPEARED" since="28"/>
 		<field name="CONTENT_CHANGE_TYPE_PANE_TITLE" since="28"/>
@@ -59947,6 +60038,9 @@
 		<field name="ACTION_COPY"/>
 		<field name="ACTION_CUT"/>
 		<field name="ACTION_DISMISS"/>
+		<field name="ACTION_DRAG_CANCEL" since="33"/>
+		<field name="ACTION_DRAG_DROP" since="33"/>
+		<field name="ACTION_DRAG_START" since="33"/>
 		<field name="ACTION_EXPAND"/>
 		<field name="ACTION_FOCUS"/>
 		<field name="ACTION_HIDE_TOOLTIP" since="28"/>
diff --git a/current/public/framework.aidl b/current/public/framework.aidl
index 178c0b8..3f22df1 100644
--- a/current/public/framework.aidl
+++ b/current/public/framework.aidl
@@ -592,6 +592,7 @@
 parcelable android.service.timezone.TimeZoneProviderSuggestion;
 parcelable android.service.voice.HotwordDetectedResult;
 parcelable android.service.voice.HotwordRejectedResult;
+parcelable android.service.voice.VisibleActivityInfo;
 parcelable android.service.watchdog.ExplicitHealthCheckService.PackageConfig;
 parcelable android.speech.tts.Voice;
 parcelable android.telecom.AudioState;
@@ -861,7 +862,9 @@
 parcelable android.widget.inline.InlinePresentationSpec;
 parcelable android.window.DisplayAreaAppearedInfo;
 parcelable android.window.DisplayAreaInfo;
-parcelable android.window.StartingWindowInfo;
 parcelable android.window.TaskAppearedInfo;
+parcelable android.window.TaskFragmentCreationParams;
+parcelable android.window.TaskFragmentInfo;
+parcelable android.window.TaskFragmentOrganizerToken;
 parcelable android.window.WindowContainerToken;
 parcelable android.window.WindowContainerTransaction;
diff --git a/current/system-server/android.jar b/current/system-server/android.jar
index 6931740..294eb0b 100644
--- a/current/system-server/android.jar
+++ b/current/system-server/android.jar
Binary files differ
diff --git a/current/system/android-non-updatable.jar b/current/system/android-non-updatable.jar
index 3842bc3..0038123 100644
--- a/current/system/android-non-updatable.jar
+++ b/current/system/android-non-updatable.jar
Binary files differ
diff --git a/current/system/android.jar b/current/system/android.jar
index f536eac..3bd3036 100644
--- a/current/system/android.jar
+++ b/current/system/android.jar
Binary files differ
diff --git a/current/test/android-non-updatable.jar b/current/test/android-non-updatable.jar
index 099813a..8b97add 100644
--- a/current/test/android-non-updatable.jar
+++ b/current/test/android-non-updatable.jar
Binary files differ
diff --git a/current/test/android.jar b/current/test/android.jar
index 6aaef3d..e774226 100644
--- a/current/test/android.jar
+++ b/current/test/android.jar
Binary files differ