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

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



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