Fix incorrectness logical for add ANDROID_PROPERTY_WORKSPACE

Change-Id: I62ccf4b9dc9841b04298a8c5ae37d790dce69623