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: fe5e2d6a am: d4a089e8

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

Change-Id: I57830d56307cae00ea4669b19d71017ddb7a0be1