[automerger skipped] Merge "Tuner FW: clean up Dvr/Filter message-queue resources upon close" am: e42498a501 am: c86d34a950 am: bd07cdc90b -s ours

am skip reason: skip tag Change-Id Iea28f07a0800cbab88a1348fa7ae21ac17e1cfd8 with SHA-1 bc30a4b182 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634480

Change-Id: I5e8ec35e8091813d188f2ccd039d6185849b4741