Merge "Add the build and aconfig default values to bugreports." into main am:...

Merge "Add the build and aconfig default values to bugreports." into main am: 2ef69194 am: f320f1d9

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



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