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

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



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