Merge "Separate diffing from Android.bp generation." into main am: d51aa3c8fd

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

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