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: 6544b587

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



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