Merge "remove fmq reference when dvr and filter are closed." into sc-dev am: 8d574441 am: 04065db1

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

Change-Id: I9316f6ab727a9aae20c692362b0f4bdcfb9e68b3