tree 7a58e3f3e71d91960b15d10fdb7d1c91c28dde5c
parent 2aa907fbab9b335e7a9b77e191490ea53cbb0952
parent 31fdc7415460ca1aace74da11d2375b165018529
author TreeHugger Robot <treehugger-gerrit@google.com> 1593671421 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593671421 +0000

Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154

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

Change-Id: I8e8f8c6518c45130203df5aee8212041074f5c0b