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

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



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