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

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



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