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

[automerger skipped] Merge "Split android_non_updatable_stubs_libs" into aosp-main-future am: deefb2be -s ours

am skip reason: Merged-In Ia8aec25c6c6a199f36a69062754f5b02b15fdb59 with SHA-1 5b9160e9 is already in history

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



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