Merge cherrypicks of [19099703] into tm-release. am: d147aa46b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/AdServices/+/19127803

Change-Id: I284400a6fdf13e09cea48edd4760eef5292639d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: dd094fb7a22d3de7499f9a8d301bde6e77b70e67
  1. .prebuilt_info/
  2. 3/
  3. current/