Merge "Fix crash due to race on close()" into tm-qpr-dev am: faf0b610

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



Change-Id: Ifa6a92cb60683f42afb541a977d255adacf029f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>