Merge "Fix bug for none fe test case" into sc-dev am: 5bae0d2702 am: 8871fefa82 am: d1b186d168

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

Change-Id: Iac223203bd8289bef117d21baf27d1c485bf928d