Merge "dumpstate: mount debugfs in non-user builds" am: e6b4397199 am: 8bcd8db9cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0c6e51c09754f4733caa406a46f289a42e5802d