Merge "Fix bug for none fe test case" am: 7dc7626822 am: 62069b5509

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

Change-Id: I0fd9fb134e977a374411167273908cbf4176f2d4