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

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

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