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 am: 50173c7d

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



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