Merge "Fix Perm issues in STService" into udc-dev am: 5a05b597

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



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