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

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

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



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