Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aa

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



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