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

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



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