Merge changes from topic "stmockhal_cts" into udc-dev am: 5a162ba7

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



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