Merge "Extend dumpstate.dry_run restrictions" am: a938daa1c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1808918

Change-Id: I734d1661d7a46e3063963915700c8ec8a93d49f7