Merge "Revert "Prevent committing session while in progress"" into tm-qpr-dev am: aac6f0ff

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



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