[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: d10850d3 am: 6d274577 -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: Ia70463f0b1e1e315fee6008d707e264655abfe55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>