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

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

Change-Id: I149b68558f640bf7d8cfaf062ca6958c33ea91df