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