Merge "Fix crash for cross-process embedding" into tm-dev am: 450a2547 am: 0ef5142b

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



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