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: Ieb88df032f18ac75b10b49fe6fc8675b4c6d14d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>