Merge "Add oneway_finalizer_close_fixed flag" into main am: 2a9533b2c6 am: 037512926b

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

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