Merge "Clean up oneway_finalizer_close" into main am: a3d6890e95

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

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