Merge "aconfig: remove trailing whitespace in test input" into main am:...

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

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



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