[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 skip reason: skipped by rpius

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



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