Merge "DPM control for remote input when locked" into nyc-dev
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335