am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"

* commit 'e15a73ee4c9a28d89888095c7649a70c116ee160':
  Bug fixes in OMA DRM v1 Forward Lock Agent