Merge "Add APV Support APIs" into main am: e4f542665b am: 5e5fe88e32

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3302498

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