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

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

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



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