Merge "Update test expectations with changed names of D8 synthetics" am: d14c779c66 am: 8ec1bd694d am: 4164dc4a52

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I120b783885e1c2f4be047ee01c389585c596006c