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