[automerger skipped] Merge "Tuner JNI: fix the DATA_READY and DATA_CONSUMED flags" am: ba032abd1a am: e02a166bb5 am: 1ba1275a6d -s ours

am skip reason: Change-Id Ifd8b03259eff2296d1420695176d34026ba586fd with SHA-1 870676c977 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e9b091aeedac4771809e9cb7fdf30197eaf72b9