Fix force setting environment variable error am: b3d5fef7 am: 0ff8e76b am: 313d0a0e

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



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