Merge "Extend dumpstate.dry_run restrictions" am: a938daa1c6 am: 17852592f0

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

Change-Id: I1da7230e78a594ad7dbd1e780d864232bd669e7a