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

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

Change-Id: Ic489370732fbc6be6d2da819acd8d04ea30ac958