Add the rest of the AACR fields am: 57dd93fb86 am: 04687ef556

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16482304

Change-Id: I8f288e2704e8109f8f9d1bdeedd4cc684f70d1fe