Merge "Fix failed while running same pair again" into tm-qpr-dev am: 9e656e7c

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



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