Merge "Drop product config include tags" into main am: 27d977e4 am: 4203b5ba

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



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