Merge "Add STModule selection TestApis" into udc-dev am: a64a5abcef am: cfc8ffe5bd

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

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