Merge changes from topic "st_stopping" into udc-dev am: 9e6c6ca8 am: 5ad58c61

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



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