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

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



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