[automerger skipped] Split android_non_updatable_stubs_libs am: 13f59369 -s ours am: 8c0879af -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: I3b96bd15761782ffbdbbeef146d8991a7d83da71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>