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: 0b513160 am: b5054e35

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



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