Merge "Fix ServicePermissionsTest#testDumpProtected" into sc-dev am: 68662ec826 am: c634282f14
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622501 Change-Id: I7d42e1dcbb20241af42cac83c529036a330b39cd
This commit is contained in: