[automerger skipped] Merge "[RESTRICT AUTOMERGE]Don't finish noHistory...

[automerger skipped] Merge "[RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the topmost." into rvc-qpr-dev am: 0015e454 am: dd0e7200 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6eb63550d1d8cde56cfb6706e5f8a765244a14d8