[automerger skipped] Merge "Create a new permission to override Overridable...

[automerger skipped] Merge "Create a new permission to override Overridable change ids" am: 44008b63 am: a5b9c920 am: f555b425 -s ours

am skip reason: skip tag Change-Id Ib8d5d83b5fd62acb5808d10f5c413616f29ee65c with SHA-1 8ee7f9a4 is already in history

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

Change-Id: Iede33249df1f9df8806b3b9bbc6c7d8a9b7072f9