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

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

Change-Id: Ida0aa292032a8e993a057bc9c4af73da8751d864