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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a3f2e855840d7f38c4d88305094dd5379ab11d0