Merge changes from topic "stmockhal_cts" into udc-dev am: 5a162ba7be am: 68940c1a5c

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

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