Merge "Be even more explicit about changing generated Android.bp files" into main am: 16cc7a9f24

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

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