Merge "Merge "Fix crash for cross-process embedding" into tm-dev am: 450a2547 am: de11a18d am: 5f931d22" into tm-qpr-dev-plus-aosp am: a126b583

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



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