Merge "Release ICloseHandle instance after announcement listener is unregistered" into rvc-qpr-dev am: 4d94bc86f8 am: 859d5c9eae

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

Change-Id: Icf1dd0f39da9e697149bc8b799190c74613e7f6c