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

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

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