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

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



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