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

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

Change-Id: I8c9bf40afcf62adadbde1090667e6071534f1660