[automerger skipped] [MS82.2] Add a rewriteSingle method that takes two...

[automerger skipped] [MS82.2] Add a rewriteSingle method that takes two timestamps am: 807a7f37 am: 8b3b5463 -s ours am: 10090607 -s ours

am skip reason: Merged-In I17558f349cb2a33062972fe1af96a19356798692 with SHA-1 6ab8172b is already in history

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



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