[automerger skipped] Reland: Remove workarounds by data_device_bins am: 921da951 -s ours

am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 13a0652e is already in history

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



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