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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d3de8491541219c9ef1faa461c3160cc988e01