Reformat AVDs to allow better understanding of the changes in the am: bf76475f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23831663



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