Merge "Reland: Remove workarounds by data_device_bins" into tm-dev-plus-aosp...

Merge "Reland: Remove workarounds by data_device_bins" into tm-dev-plus-aosp am: b7eead5e am: 95eee2b5

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



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