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

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

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



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