[automerger skipped] Merge "Revert "Prevent committing session while in...

[automerger skipped] Merge "Revert "Prevent committing session while in progress"" into tm-qpr-dev am: aac6f0ff am: 94ff92ef -s ours

am skip reason: Merged-In I1f5a90acde1874b3efbe4dad55f366e991bb4a21 with SHA-1 7d279c7d is already in history. Merged-In was found from reverted change.

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

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



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