[automerger skipped] Merge "Revert "nfc(framework): Split non-updatable...

[automerger skipped] Merge "Revert "nfc(framework): Split non-updatable portion to a separat..."" into main am: c04c1151 -s ours am: 2e5f670c -s ours

am skip reason: skipped by rpius

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



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