Merge changes from topic "goodbye_libnix" into main am: fb83f801e4 am: 66f991c467

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3314054

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