Merge "Only revert until the latest baseline." am: fbb39544

Original change: https://android-review.googlesource.com/c/platform/build/+/2289886



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