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

Fix force setting environment variable error am: b3d5fef7 am: be10911b am: 44ad15bd am: 034ea0d4

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



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