[automerger skipped] Merge "Reland: Remove workarounds by data_device_bins"...

[automerger skipped] Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aa -s ours am: 3a4d8b05 -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: Ice4a797f0882dfd8bf3493d101045e32d15d5797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>