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

[automerger skipped] Merge "nfc(framework): Split non-updatable portion to a separate folder" into main am: 5549309d -s ours am: 6d3bef7a -s ours

am skip reason: skipped by rpius

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



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