Merge "Update test expectations with changed names of D8 synthetics" am: e95ab5e3dd am: 4329977e67

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13919bd6c0d96132ed9f7998c4e652a51ceef021