Merge "Merge "Tuner API: make DvrPlayback.attach/detachFilter no-ops" into rvc-dev am: cc0b494b am: ebbe9095 am: c6827e53" into rvc-qpr-dev-plus-aosp