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

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



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