Merge changes from topic "printflags-include-device-config" into main am:...

Merge changes from topic "printflags-include-device-config" into main am: dd1ebe93 am: 286ea9f8 am: 8bc2be2b am: 6f3642b8

Original change: https://android-review.googlesource.com/c/platform/build/+/2763270



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