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

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



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