am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

* commit '503f4daf0113579e111d371dbfb6824cc8c311f1':
  Bug 4159373 Use HDCP debug settings