Merge "[RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the topmost." into rvc-qpr-dev am: 0015e454b6

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

Change-Id: I37d531eb10db054d2ecc87635b8013e4c9aa570c