Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev am: 778f431a am: c41f15f3

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



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