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

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

Change-Id: Ifcb83c05d9a53fa48ab37e2e90f69ef4ef2db2df