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: I886f9a9e425db1c10ecdc62f1e1aa749e085367d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>