[automerger skipped] Merge "Fix bug for none fe test case" am: 7dc76268 am:...

[automerger skipped] Merge "Fix bug for none fe test case" am: 7dc76268 am: 62069b55 am: 3f83fa66 -s ours

am skip reason: Merged-In I86458142ba4155274594a793eb939567bea24734 with SHA-1 3e1a1d32 is already in history

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

Change-Id: Ia16b7610d96412d26dfdc1fda9c21f1f53c949dd