Merge "Enable updatable apex and vndk 30 for CSI" am: 31d9246ae6 am: 7f2a616a5d am: 1526920eca

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1516258

Change-Id: Ide22c9fd68744647ef411c8bf5856fc0e1e09da3