[automerger skipped] Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16 -s ours

am skip reason: Merged-In Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7 with SHA-1 3a8198c3ba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450

Change-Id: I887655da5225567835f9396decbee63ef7c36b62