Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 am: 746cfb436c

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

Change-Id: I96011a6182972ca0e4faf66413139ea3abf0aeab