[automerger skipped] Merge "add CONTROL_APP_BLOCKING permission to car ks...

[automerger skipped] Merge "add CONTROL_APP_BLOCKING permission to car ks app." into sc-qpr1-dev am: 1a8db820 -s ours

am skip reason: Merged-In I6c6d860a4b884d8856ede3aa4c73c64a9c568dd5 with SHA-1 5ffbc2c1 is already in history

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

Change-Id: I0843631f1825ad47fae6ac17781e39add19f6a1e