Merge "Tuner JNI:  Correct memcpy of C2DataIdInfo" am: 55a580b253 am: 575365367a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I046a2ed3bbaece122a563031cd8309021f2401a7