Merge "Merge "Enable use_embedded_native_libs for CtsShimPrivUpgrade" into...

Merge "Merge "Enable use_embedded_native_libs for CtsShimPrivUpgrade" into udc-dev am: 12aac90c am: 960c26e1 am: cc45396d" into udc-qpr-dev-plus-aosp am: 1826448f

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



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