Merge "Catch SecurityException when sending clip change broadcast." am: 4274dee38b am: 99f50fd104 am: ff9a81be7d

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

Change-Id: I37b115a7a3023724fd49e7c5a71cd9441b61f8b2