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

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



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