Merge "Move ro.apex.updatable to the system partition" am: 770bfc34 am: 0e3d0523

Original change: https://android-review.googlesource.com/c/platform/build/+/2627769



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