[automerger skipped] Merge changes from topic "fdo_profile" am: 43a2a9a5 am: e85290a0 -s ours

am skip reason: Merged-In Ia14679285b92f3f14ff269392a61f978c71311b2 with SHA-1 611f0366 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517917



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