Merge "Don't allow sdk sandbox processes to register/unregister CPs" into...

Merge "Don't allow sdk sandbox processes to register/unregister CPs" into tm-dev am: 4baae1f7 am: 0c510e67

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



Change-Id: I113946b14df5a006d8847346dfde60e542666da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>