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

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

Change-Id: I0f7b30c9241ddf67357ecd65d3997c1bdd579e0b