[automerger skipped] Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190 am: 123934b067 am: 99d8ba3970 am: d10850d396 am: 6d274577db -s ours am: 37e86bb00c -s ours am: 1b21033072 -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: Id2e34d9e8d8edf29d7a3bf2ed3a1767ea09ed3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>