Merge "Add a unit test for auto-enter PiP by navigating to home" into...

Merge "Add a unit test for auto-enter PiP by navigating to home" into tm-qpr-dev am: c11694a3 am: 16ad5b71

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



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