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

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



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