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

Merge "Move ro.apex.updatable to the system partition" am: 770bfc34 am: 0e3d0523 am: 416c3d67 am: 38207419 am: 8f735a89

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



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