[automerger skipped] Merge "Enforce @NonNull package name for...

[automerger skipped] Merge "Enforce @NonNull package name for onMediaKeyEventSessionChanged" into tm-qpr-dev am: 4fdaf48b am: 3e5ce5be -s ours am: b44553ea -s ours

am skip reason: Merged-In I0fdada5ed6d27a02ee0c1ab58423238c7651b5de with SHA-1 89feb369 is already in history

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



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