Merge "Fix issue which Ion handle are free twice." am: d70c636ad4 am: def12823c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0e63d4092fc030f316b5c11261b3a37adb9b5c0