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

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



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