am d99ebf8b: Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev

* commit 'd99ebf8bc7aaadeb006bfd47e4adc05d9b4e4564':
  Fix name error in com.android.mediadrm.signer.xml