[automerger skipped] Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190 am: 123934b067 am: 99d8ba3970 am: fc7b9c26ea -s ours am: 1551b37cda -s ours am: d0ec921aef -s ours am: 671364dd1f -s ours am: ce66bcb38d -s ours

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

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

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