am 66104e1e: am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev

* commit '66104e1e19316d2c0a7b978093e2d9166f9cbda4':
  Make MediaRouter ignore remembered wifi displays when wifi display is off