Merge "Dump /proc/bootconfig in dumpstate" am: adbac998 am: 4e198eef am:...

Merge "Dump /proc/bootconfig in dumpstate" am: adbac998 am: 4e198eef am: 095f56df am: 1c8cc804 am: 831259c1

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



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