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

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



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