Merge changes from topic "embedding-race-condition" into tm-dev am: 87550b06

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



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