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

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



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