[automerger skipped] Fix non-dismissible resumption players. am: 36fc7e464e am: 1f419e4ddf -s ours
am skip reason: Change-Id I186f9ee6fc228ad5bd1d49970fb44709783b74dc with SHA-1 656e986464 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12995017
Change-Id: I295268e2dc95d783197e44b80ad080fcf686b94f
This commit is contained in: