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

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



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