Merge "Add 'origin' parameter to flag declarations" into main am: da552368 am: 57c2dcff

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



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