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: 01a34cf1 am: 05ba4ae8 am: 93f20603

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



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