[automerger skipped] [Berberis] Code clean up am: 00675ce72b am: 49116642d6 am: 30ea27ab11 -s ours

am skip reason: Merged-In Ibd4802e6ee125131eb3b8be01950b6661601a21e with SHA-1 d707b481a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2908697

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