[automerger skipped] [RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the topmost. am: 59a51c6ba9 am: 0559b64472 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7580fd5a8e6cf30d8fed64e241e65e78a0b006c1