[automerger skipped] Update the behavior to match the documentation. am: bc72f89e1f am: 66e3542e9a -s ours

am skip reason: Merged-In I2d0cd06f0021f76fe780dcf21e3cb18279190a92 with SHA-1 c2bc1c8399 is already in history

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

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