Merge "vndk libs - frozen true" am: a4f9873b72 am: 1730f442e4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2309833

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