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

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

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



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