[automerger skipped] Merge "Fix issue which Ion handle are free twice." am:...

[automerger skipped] Merge "Fix issue which Ion handle are free twice." am: d70c636a am: def12823 am: 4b7054b9 -s ours

am skip reason: Change-Id I3a53fe949ecfdff4614a44cc1ddecdbeaa583dd8 with SHA-1 cc7d12ea is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dc2e28ef9489ded8cb7249349657bd4330ee85b