Merge "Unit test automation for Multilayer Evaluation" am: c1115803bc am: 762fabc387

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27cc11033aa430ba5af00773351bb5e54b488aff