[automerger skipped] Merge "Split android_non_updatable_stubs_libs" into main...

[automerger skipped] Merge "Split android_non_updatable_stubs_libs" into main am: 911f9201 -s ours

am skip reason: Merged-In I7ed37e1e1b3faa1f49bfb840833a5b7c207540cf with SHA-1 e97d1125 is already in history

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



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