Merge "Revert "Revert "nfc(framework): Split non-updatable portion to a...""...

Merge "Revert "Revert "nfc(framework): Split non-updatable portion to a..."" into main am: f153bc11

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



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