tree 08ef8fcf5dd39b67eedd0272799e48ba5d3d9463
parent 48dec93d4a7036d8d0b6677b9b08b9dab37b9f58
parent 1d12360a9eec1403497f87a85909e6accf9c0767
author Treehugger Robot <treehugger-gerrit@google.com> 1610498989 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610498989 +0000

Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 am: c0d6dea0fb am: 1d12360a9e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71eb5e8389ae2e90af0d3eb01b2e4b878f51f9c4