Merge "Avoid sending messages of destroyed Engine" into udc-dev am: 359c0a20 am: 68c4407c

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



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