am cc3fbb7b: Merge "Fix bug 5357295 NPE on display when remote control client dies"
am cc3fbb7b: Merge "Fix bug 5357295 NPE on display when remote control client dies"

* commit 'cc3fbb7b699083518340cfd57334d3798d881a49':
  Fix bug 5357295 NPE on display when remote control client dies

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base