Merge "Handle include statements with trailing whitespace" into main am:...

Merge "Handle include statements with trailing whitespace" into main am: a32f556a am: 4a699d0d am: 24a71565 am: 750d2e9c am: a4aa3ffa

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



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