[automerger skipped] Slim down the sdk product am: 28f089d9 -s ours am: 787e1ac1 -s ours

am skip reason: Merged-In I940655c39a3ae58839521416abafaf461df44921 with SHA-1 af948542 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18598732



Change-Id: Ifd9476f37f8a607e66100d4ec920d9061323aac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>