[automerger skipped] Merge "Have FrameworksVcnTests access hidden API" am:...

[automerger skipped] Merge "Have FrameworksVcnTests access hidden API" am: ca1c4e2f am: bde1da0e am: 6a152302 am: 96a396da -s ours

am skip reason: Merged-In I2e92f27b4d10612d9000c0fc0d5866dd0313a336 with SHA-1 023328e2 is already in history

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

Change-Id: I71fa2c512966a3b73fcf13501f70862af5793be1