Snap for 6921388 from 7737e3dc0188ac22bbab8872df869559674eac40 to qt-aml-tzdata-release

Change-Id: Ifd12803a5cd299585320ba0af9aa07f91b7b4e06

build/optional.json

diff --git a/build/optional.json b/build/optional.json
index 4b3bedf..b63c165 100644
--- a/build/optional.json
+++ b/build/optional.json
@@ -5,6 +5,11 @@
     "manifest": false
   },
   {
+    "name": "android.car",
+    "jar": "android.car.jar",
+    "manifest": false
+  },
+  {
     "name": "android.test.mock",
     "jar": "android.test.mock.jar",
     "manifest": false

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index e427817..25e1d6f 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -172,6 +172,8 @@
 # optional API files.
 development/build/optional.json                                                               platforms/${PLATFORM_NAME}/optional/optional.json
 ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar  platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar
+# Android Automotive OS stubs.
+prebuilts/sdk/29/public/android.car.jar                                                       platforms/${PLATFORM_NAME}/optional/android.car.jar
 # deprecated APIs
 ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar     platforms/${PLATFORM_NAME}/uiautomator.jar
 # Test APIs