Merge "Split notification and app launch tests in different modules" into...

Merge "Split notification and app launch tests in different modules" into udc-qpr-dev am: 588cd05e am: 159b663e

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



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