Merge "Implement new virtual method introduced in OpenCSD 1.2.1" am: 0b89e78d0e

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2270112

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