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

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

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

Change-Id: I8feb2eadce37e743249c1c4fac0d6a6f817b936c