[automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into tm-dev am: 9b846de147 am: 66f6dad116 -s ours am: 923870bfe4 -s ours am: 8a7fb9ec94 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 55a6021f24 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346143
Change-Id: I9e52b2811f61d6f7b649571c8a305ec5bb6847d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: