Merge "Replace logic for sdk source jar" into main am: 08709dccaf

Original change: https://android-review.googlesource.com/c/platform/development/+/2760387

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