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

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

Change-Id: Ia469b8a9ac0433c6e1691ae34478bd7c57eea104