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: 2f8a8ac6

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



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