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

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

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