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

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