Wrap Activity->Activity changes in non-activity transitions am: 8365273c

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



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