Merge "Don't include PiP activity in app transit" into tm-dev am: 20fc9f18 am: f0543d35

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



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