Merge "Allow extending vtables" am: aa16c32035 am: f20282969f

Original change: https://android-review.googlesource.com/c/platform/development/+/2241773

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