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

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

Change-Id: I62d631a6d0a8c9f58fbc1056d3f9a33f19426faf