am ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev

* commit 'ecc8db5ee83d648532be1392f53277aa3a25284e':
  Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.