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

[automerger skipped] Merge "Reland: Remove workarounds by data_device_bins" into tm-dev-plus-aosp am: b7eead5e am: 95eee2b5 am: f608eb2b -s ours

am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 3b6c701c is already in history

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



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