android17-release - platform/development

commit: 4dafd114fab3c3d9543a5aff0ad097f479915176
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Thu May 14 21:20:15 2026 -0700
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Thu May 14 21:20:15 2026 -0700
tree: 22c91e2eae7bc116af9a28d527d7571795a74453
parent: c6b9a060610f91667e1dab693d8bd097cf7d0159 [diff]
parent: 94eee1c16b500be98a09b8dd86b3c7e3d9cbf445 [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/39828406'] into 26Q2-release.

Change-Id: I00fb37b3ebebd2f799fff0fb5793b546a0781e2d

tree: 22c91e2eae7bc116af9a28d527d7571795a74453