Merge "Add unique notification ids for mic/cam toggles" into sc-dev am: e8bda649 am: c38d7441

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

Change-Id: I0350ac9ea7d75f52fc8bf0b935d6c5343886878b