[automerger skipped] Merge "Confirmationui Rate Limiting App Abort Bug Fix" am: 2d5b18b9b7 am: 9d79917068 am: 91d71ac203 -s ours
am skip reason: Change-Id I5f3af166391a32748a26f7709d30a5ac718499c0 with SHA-1 efe6ad0b83 is in history

Change-Id: I0e2cfa3f0cd6a6c6f6fa9d5ecd15b4ff23157299