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

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

Change-Id: I524a4703b634115a890813f7196a758d0398469d