Merge "aconfig: add dump --format=textproto" am: 571cd077 am: f29ee872

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



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