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

Change-Id: Id1947aa9f534671f9f183cdeec2932da50439e12