Merge "Dump /proc/bootconfig in dumpstate" am: adbac99831 am: 4e198eefea am: 095f56df3e

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

Change-Id: I49749b0b028ab2fd6200dfa33fd513267042396c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>