[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-v2-dev am: 277479d9 am: 8b52b141 -s ours

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

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

Change-Id: Idd7ceea0792b682e65c995267c5c96f38b39e346