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

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

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