Merge "aconfig: remove trailing whitespace in test input" into main am: 0f2e089f am: 00c2e125

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



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