Merge "Workaround missing OnChannelClose for DisplayManagerService" into pi-dev am: 409a80198b
am: ee7e4a13c3

Change-Id: Ib46496c09aa1cee6efc5906461ec41b2ee8da2a4