Merge "Have FrameworksVcnTests access hidden API" am: ca1c4e2fc2 am: bde1da0e0a am: 6a152302ba

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

Change-Id: Ibee6d7723968749989451539b230a2c2d32f8e91