[automerger skipped] Add demux to mFrontendTests am: 86aa7010 am: 6afaf8d1...

[automerger skipped] Add demux to mFrontendTests am: 86aa7010 am: 6afaf8d1 am: 123934b0 am: 99d8ba39 am: fc7b9c26 -s ours am: 1551b37c -s ours am: d0ec921a -s ours am: 671364dd -s ours

am skip reason: Merged-In I62ad038829ca3ed0ecc077527197eec444a5eb12 with SHA-1 86aa7010 is already in history

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



Change-Id: I63f5f958397b24dbf5cc87e385a2bbc9cbf52c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>