Fix force setting environment variable error am: b3d5fef7 am: be10911b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3081420



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