Merge "Resolve target SDK from Notification extras" into tm-qpr-dev am: a53fd2a5 am: a580f813

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



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