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

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

Change-Id: I31e7357ec4babe64136cf586fa4f47cb277e7d63