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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96d27cab734cfe23edd1aacaa61ddb7ced4b972d