Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev am:...

Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev am: 778f431a am: c1f1ca49 am: 80cc551a am: b7efc519

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



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