Merge "Add new MANAGE_SMARTSPACE permission for the cts test" am: 7bba23015b am: 59962122dc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5083af2dae9d1cf1a0753695d2cd5f4186bc6d4e