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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9aae1d357e0edc2c79270cc075a7bdbfbb0c104