Cong Lin
2caa832158
Fix a few Vts failures in factory_upload_tool
...
1. Fix getHardwareInfo
2. Allow unused param to be empty
3. Deprecate generateCertificateRequestV1
4. Update Wv IRPC Hal version to 3
Test: run VtsHalRemotelyProvisionedComponentTargetTest
Test: vts_treble_vintf_vendor_test.DeviceManifest SingleAidlTest
Bug: 285527325
Bug: 285289790
Change-Id: Id4080e8630d01ad5540f49ae0d13b707e541b36a
2023-06-23 13:52:45 -07:00
Kyle Zhang
b19b3cdacc
Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 28012d50f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543
Change-Id: I2b3df520c8a2d05f924c22cc685d2e738093cee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 01:09:29 +00:00
Kyle Zhang
28012d50f0
Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543
Change-Id: I34d61177c9406dfb5da18fe806dde9bc92cc6c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 00:25:47 +00:00
Kyle Zhang
a1d7a42cf6
Drop Widevine apex prebuilt files to android source tree.
...
The following files have been updated as part of this change:
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34
Built here: ab/10167125
The change is generated with prebuilt drop tool.
Bug: 279835636
Change-Id: Ic4cb80f7e20e7cee6e89ae1c0197d9cb624e6211
2023-05-30 21:37:16 +00:00
Jooyung Han
1967d0ea64
Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770
Change-Id: Idb6c4845a7360da81514a5bf9bf57b911fe4adc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 21:04:46 +00:00
Jooyung Han
32bf611f35
Fix build script: set output path explicitly am: 49cc8da350
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770
Change-Id: I121d3db92d5bc22105eb3f9cbc059d18515b4134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:09:28 +00:00
Jooyung Han
49cc8da350
Fix build script: set output path explicitly
...
dev_sign_bundle uses `out/dist` as default out directory. It should
respect DIST_DIR setting.
Bug: 281617982
Test: git_mainline-widevine-release/mainline_modules-user
Change-Id: I2ede21b099b512c948e4e83702a1478982acc779
2023-05-16 13:35:34 +09:00
Vicky Min
f7f0278f09
Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132
Change-Id: Ic3d7139af838fa91b39783028fdc5029726ed6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 03:51:37 +00:00
Vicky Min
2b62113f19
Fix oec session id in dynamic adpater am: 74a9f80790
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132
Change-Id: I31ff36896dd05e4500fc1f3c4b95645cf7c682fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 03:11:39 +00:00
Vicky Min
74a9f80790
Fix oec session id in dynamic adpater
...
[ Merge of http://go/wvgerrit/175310 ]
Pass the real oemcrypto session id from `pair.session` instead of
`session` for LoadEntitledContentKeys, since `session` can be
changed when L1 and L3 are running in parallel and `session` in
that case may not be the correct oemcrypto session id any more.
Bug: 279967915, 282180589
Test: wvts
Change-Id: I127ff37abf8b618dfbcb623f59bc999e58e7a028
2023-05-15 18:40:21 +00:00
Treehugger Robot
eff669ba73
Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195
Change-Id: Iedeb2aae3101da8dedb921a6c192f1637b887569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 09:53:22 +00:00
Treehugger Robot
0536d41235
Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195
Change-Id: Ic1bcc8fae79ebbdaca086198f6253bb6330412d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 09:12:53 +00:00
Treehugger Robot
99b760c857
Merge "Update gts/cts helper script with WVTS paths" into udc-dev
2023-05-13 08:13:55 +00:00
Rahul Frias
eb72b1dfe4
Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: 486c57f783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536
Change-Id: Ibeecc5f906959378a1a8d591705e24cd20cbd7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 05:22:17 +00:00
Treehugger Robot
5f5089dd13
Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955 am: 6ee8154438
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888
Change-Id: I1cacb99491c0f05be9a6293f28fdc85afb4a4ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 05:22:11 +00:00
Rahul Frias
486c57f783
Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536
Change-Id: I43bf0eca5c40a22bfa595e11c1b039ebd21a24ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:40:32 +00:00
Treehugger Robot
6ee8154438
Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888
Change-Id: I035e02d71881ff16b53acb31576e2838814dc29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:40:24 +00:00
Rahul Frias
75c1b88603
Merge changes I5cbfcc73,I3070b3f3 into udc-dev
...
* changes:
Indicate support for initial_renewal_delay_base
Fixes for renew on license load
2023-05-13 04:08:22 +00:00
Treehugger Robot
81cb2ba955
Merge "Fix oec session id in dynamic adpater" into udc-dev
2023-05-13 03:59:16 +00:00
Jooyung Han
ab4c1e6f63
Fix build_test breakage am: 5a6c57b11a am: ba6b21281b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877
Change-Id: Ia001ca12a5a005777ad728b6c4f889519ebfd63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 01:31:06 +00:00
Jooyung Han
ba6b21281b
Fix build_test breakage am: 5a6c57b11a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877
Change-Id: I00ef62534753e692bec3ad465cf2f819d84c5aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:46:36 +00:00
Jooyung Han
5a6c57b11a
Fix build_test breakage
...
CI build_test target tests every product, which invokes the new
widevine_generic product out of the build script. This makes build fail
due to the missing TARGET_BASE_PRODUCT.
Fix it by fallback to module_arm as base product.
Bug: 281617982
Test: TH
Change-Id: I36d437a56609865e64aea86c5d3af02887b42bc7
2023-05-13 07:34:07 +09:00
Rahul Frias
0c288c1cda
Indicate support for initial_renewal_delay_base
...
[ Merge of http://go/wvgerrit/174555 ]
This is only announced if OEMCrypto is v18+
Bug: 278751387
Test: Duration use case tests, wvts tests
Change-Id: I5cbfcc733ed2af2c940fde381b40a5be850e7e88
2023-05-12 15:05:44 -07:00
Rahul Frias
669fc9c7af
Fixes for renew on license load
...
[ Merge of http://go/wvgerrit/173290 ]
* Renew timer offset from when license is loaded verifies that the
rental duration has not expired and begins decryption.
* Renew timer offset from first decrypt bugfix
* Feature is enabled based on oemcrypto v18 presence
* Renewal logic verifies that |can_renew| is enabled
* Unit tests were added to reflect use cases from duration
and renewal documentation
Bug: 278751387
Test: policy unittests, CdmUseCase tests, wvts tests
Change-Id: I3070b3f31b316e150c28ebe38d0440ab1eeb89b9
2023-05-12 15:02:32 -07:00
Vicky Min
5026c50ebc
Fix oec session id in dynamic adpater
...
[ Merge of http://go/wvgerrit/175058 ]
Pass the real oemcrypto session id from `pair.session` instead of
`session` for LoadEntitledContentKeys, since `session` can be
changed when L1 and L3 are running in parallel and `session` in
that case may not be the correct oemcrypto session id any more.
Bug: 279967915, 282180589
Test: wvts
Change-Id: Iad0ac5e505d3b38d220f1484d4cf5f8bc3b5337f
2023-05-12 21:17:58 +00:00
Rahul Frias
3feba213eb
Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 023fd9d026
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670
Change-Id: I9beb3c25b088e6a162b660fb7012d4a43716443b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 16:13:06 +00:00
Rahul Frias
023fd9d026
Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670
Change-Id: I6768d72e30a2ec12ca579d2555692d833146fb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 15:31:35 +00:00
Rahul Frias
13368f4076
Merge changes Ied664ce8,I90004025 into udc-dev
...
* changes:
Test refactoring to support load on renewal tests
Fix formatting of renew on license load integration tests
2023-05-12 15:08:16 +00:00
Jooyung Han
9f2adca71c
Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000
Change-Id: I0d0860975cf8bc27690b892c8164af649f79977a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 09:34:12 +00:00
Jooyung Han
fbaede0920
Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000
Change-Id: I0dcd49214028a32eeeca0f2ecd16ad3ada6a626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 08:53:25 +00:00
Jooyung Han
d13f8124ff
Merge "Add build script for widevine apkset." into udc-dev
2023-05-12 08:14:22 +00:00
Rahul Frias
d50b9031c9
Test refactoring to support load on renewal tests
...
[ Merge of http://go/wvgerrit/174470 ]
There are two sets of changes
* Mocking CryptoSession so that OEMCrypto API version can be queried
* Creating a PolicyEngineTestV16 so that API version expectations
can be set and V18 can be accommodated.
Bug: 278751387
Test: policy_engine_unittest
Change-Id: Ied664ce87e22f697b6a45d3c573e22273e65e37f
2023-05-11 16:16:20 -07:00
Alex Dale
47ce6117ef
Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071
Change-Id: I372c0af8eec7b005d3fe0850d9edf9e383c3a2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:47:04 +00:00
Alex Dale
36da43c5f1
Remove duplicate session ID in metrics dump. am: ed81ae2b11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071
Change-Id: If31c40e4512219338d21872ab43ece22be51ac03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:04:52 +00:00
Rahul Frias
f0e546d703
Fix formatting of renew on license load integration tests
...
[ Merge of http://go/wvgerrit/174270 ]
Bug: 240995342
Test: Duration use case tests
Change-Id: I900040256b4accf2b695a6da0827033eadb4f2e4
2023-05-11 01:52:08 -07:00
Jooyung Han
6808813f46
Add build script for widevine apkset.
...
This builds Widevine APEXes for every target arch and then build APKS
file signed with devkeys.
Bug: 281617982
Test: DIST_DIR=out/dist UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
TARGET_BUILD_APPS="com.google.android.widevine \
com.google.android.widevine.nonupdatable \
com.google.android.widevine.lazy" \
vendor/widevine/libwvdrmengine/apex/device/build.sh
Change-Id: I6b47d9de3d572298e84b26b744710818e9f75210
2023-05-11 16:01:39 +09:00
Alex Dale
ed81ae2b11
Remove duplicate session ID in metrics dump.
...
[ Merge of http://go/wvgerrit/174932 ]
Bug: 281794097
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: Id29e1c4298ed5b86453f22012cfccc2cb5ee7d05
2023-05-10 16:20:45 -07:00
Kyle Zhang
8c55ada2c0
Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485
Change-Id: I4378a595f5fec4730ed42949be9ecd5964c124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:23:24 +00:00
Kyle Zhang
ec1bedb5ac
Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485
Change-Id: Iab9ef74a334cad8d5e77853b62b11ca7abd3abbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:38:37 +00:00
Kyle Zhang
1a42aed25b
Merge changes Icd280b53,I6eed117e into udc-dev
...
* changes:
Cast Receiver integration test
Combine provisioning code for tests and improve logging
2023-05-10 18:40:30 +00:00
Fred Gylys-Colwell
d211195f92
Cast Receiver integration test
...
Merge from Widevine repo of http://go/wvgerrit/169471
Remove the test in android tests and add it to the
core tests.
Bug: 276464340
Test: GTEST_FILTER="CorePIGTest.CastReceiverProvisioning*" jenkins/run_fake_l1_tests
Change-Id: Icd280b532ddae274f66b2fab3e65520e96adb7cb
2023-05-10 18:40:21 +00:00
Fred Gylys-Colwell
836b1a30a6
Combine provisioning code for tests and improve logging
...
Merge from Widevine repo of http://go/wvgerrit/169018
This CL adds a provisioning holder that attempts to
provision and logs the request and response for
failures. The server team can replay the request to debug
problems on their end.
Bug: 276464340
Test: ran cast and ota tests
Change-Id: I6eed117e504ae3287f2ba16c3c507cfdc7456f8d
2023-05-10 18:38:50 +00:00
Rahul Frias
2aa838ef07
Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917
Change-Id: Ia269e502ef01fa5f09de198a417fa078b7951ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:56:51 +00:00
Rahul Frias
d596e934af
Fix oec session id in dynamic adpater am: 09d7572ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917
Change-Id: I6666ff4867e93535ead2dad7f912ee99f2cc7b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:14:39 +00:00
Rahul Frias
09d7572ece
Fix oec session id in dynamic adpater
...
[ Merge of http://go/wvgerrit/174572 ]
Pass the real oemcrypto session id from `pair.session` instead of
`session` for CopyBuffer, since `session` can be changed when L1
and L3 are running in parallel and `session` in that case may not
be the correct oemcrypto session id any more.
Bug: 279967915
Test: wvts
Change-Id: Ic5e21ccb227d4c4992ef500435fa3b68812c4d9b
2023-05-08 23:21:47 -07:00
Treehugger Robot
21e435e3b7
Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 09a54ed365
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486
Change-Id: I40b8b136cfbb3f4ef70420a3dc59437aa6faa65f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 02:10:49 +00:00
Treehugger Robot
09a54ed365
Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486
Change-Id: Ic475a47f38058649131fb5180b558c66f7b6eb63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:26:47 +00:00
Treehugger Robot
44d207e4a2
Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 7e714045b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483
Change-Id: I257e6a73298143df873402e33516bf116b7805c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:02:50 +00:00
Treehugger Robot
7e714045b6
Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483
Change-Id: I7f6b2eff1ea45eac8268e7ff1bfd6b6f21875c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 00:32:29 +00:00
Alex Dale
4c106b7b96
Updated usage test to expect v16 duration values. am: f2bf164914 am: 633986c2d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555
Change-Id: I7c6d3a2e9aaf9c49d97faecb51bf8464e5f31f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 23:53:07 +00:00