Merge "Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev am:...

Merge "Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev am: 778f431a am: 01a34cf1 am: 3a1f8029" into tm-qpr-dev-plus-aosp am: be8cd459

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



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