Merge "Clean up oneway_finalizer_close" into main am: a3d6890e95 am: 46f6cedbda

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

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