[automerger skipped] Merge "Tuner JNI:  Correct memcpy of C2DataIdInfo" am: 55a580b253 am: 575365367a am: 2895b2d900 -s ours

am skip reason: Change-Id Ic97717e5fc32d97837e218fe769087b5abece2cb with SHA-1 df82804342 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I884c512c990fbaac60e7f93ed78b41a2b3bfe316