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

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

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



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