Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6 am: 0cdc510d6c

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

Change-Id: If48517cccabc9625cb5a7cc01babc3cff02d639b