Merge "Quote the value of product mfr in case it contains space." am: 557a4d56

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



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