Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function." am: 5052e9cf9f
am: 4f6b158fec

Change-Id: I0da8d148ca9ae47798f9347ccda1ba3a7cbca435