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

Merge changes from topic "st_stopping" into udc-dev am: 9e6c6ca8 am: 6dd7cb5c am: f61e7e38 am: 7a85ce9c

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



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