Merge "Prevent re-entrant calls to onPause" into tm-dev am: d39f0f7c

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



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