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

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

Change-Id: I0c552cbb0e443d240363c2d9ec8451c2753c5f94