Merge "Enable use_embedded_native_libs for CtsShimPrivUpgrade" into udc-dev am: 12aac90c am: 9e8bf102 am: a00f910c am: db250724

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



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