Merge "Revert "Introduce new resource overlay for Virtual DSDA"" into...

Merge "Revert "Introduce new resource overlay for Virtual DSDA"" into udc-d1-dev am: f202bac3 am: bcbd29fb

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



Change-Id: I36885ea1a4a48920c0af18f191e1781037532014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>