Merge "Do not allow multiple commits of the same rollback." am: 0979c571 am:...

Merge "Do not allow multiple commits of the same rollback." am: 0979c571 am: 5fcffb58 am: f48a10c0

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



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